summaryrefslogtreecommitdiff
path: root/package/linux
diff options
context:
space:
mode:
authorwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-02-19 13:00:30 +0000
committerwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-02-19 13:00:30 +0000
commit7d51245340742956d612c8a569f904d3a946135f (patch)
treef4e652c161de4b02c34416cff43f59a96607c27a /package/linux
parent90ce6619a3cb1ac545dd6a30a2c5c10a872adca8 (diff)
demistifying make *clean targets, fix some clean targets issues
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@272 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/linux')
-rw-r--r--package/linux/linux.config2
-rw-r--r--package/linux/linux.mk6
2 files changed, 7 insertions, 1 deletions
diff --git a/package/linux/linux.config b/package/linux/linux.config
index aef2c2888e..423fd8ce43 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 6d4545b3c4..bead2226a6 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