diff options
Diffstat (limited to 'package/linux')
| -rw-r--r-- | package/linux/linux.config | 2 | ||||
| -rw-r--r-- | package/linux/linux.mk | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/package/linux/linux.config b/package/linux/linux.config index aef2c2888..423fd8ce4 100644 --- a/package/linux/linux.config +++ b/package/linux/linux.config @@ -86,7 +86,7 @@ CONFIG_BCM4704=y # CONFIG_HIGHMEM is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set -CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs init=/etc/preinit noinitrd console=ttyS0,115200" +CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 init=/etc/preinit noinitrd console=ttyS0,115200" CONFIG_PCI=y CONFIG_NONCOHERENT_IO=y CONFIG_NEW_TIME_C=y diff --git a/package/linux/linux.mk b/package/linux/linux.mk index 6d4545b3c..bead2226a 100644 --- a/package/linux/linux.mk +++ b/package/linux/linux.mk @@ -57,6 +57,12 @@ endif $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config +ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_LZMA),y) + $(SED) "s,rootfstype=jffs2,rootfstype=squashfs," $(LINUX_DIR)/.config +endif +ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS),y) + $(SED) "s,rootfstype=jffs2,rootfstype=squashfs," $(LINUX_DIR)/.config +endif $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/arch/mips/Makefile $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile |