From 1ef215245e59a81aae397c070f95b1a35488030d Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Thu, 3 Mar 2005 02:44:10 +0000
Subject: target/jffs2/blocksize.mk for setting block size (req. for wrt54g)
 squashfs removed in favor of squashfs-lzma

SVN-Revision: 301
---
 .../linux/kernel-patches/600-linux-squashfs-lzma.bz2     | Bin 0 -> 5730 bytes
 openwrt/package/linux/linux.config                       |   2 +-
 openwrt/package/linux/linux.mk                           |  14 +++-----------
 3 files changed, 4 insertions(+), 12 deletions(-)
 create mode 100644 openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2

(limited to 'openwrt/package/linux')

diff --git a/openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 b/openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2
new file mode 100644
index 0000000..8e19292
Binary files /dev/null and b/openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 differ
diff --git a/openwrt/package/linux/linux.config b/openwrt/package/linux/linux.config
index de47772..761906a 100644
--- a/openwrt/package/linux/linux.config
+++ b/openwrt/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=jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
+CONFIG_CMDLINE="root=/dev/mtdblock2 init=/etc/preinit noinitrd console=ttyS0,115200"
 CONFIG_PCI=y
 CONFIG_NONCOHERENT_IO=y
 CONFIG_NEW_TIME_C=y
diff --git a/openwrt/package/linux/linux.mk b/openwrt/package/linux/linux.mk
index bead222..6e3f7a4 100644
--- a/openwrt/package/linux/linux.mk
+++ b/openwrt/package/linux/linux.mk
@@ -50,21 +50,13 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) $(DL_DIR)/$(LINKSYS_KERNEL_TGZ
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
 	$(PATCH) $(LINUX_DIR) $(LINUX_PATCHES)
-ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_LZMA),y)
-	$(PATCH) $(LINUX_DIR) target/squashfs-lzma/kernel-patch
-endif
 	touch $(LINUX_DIR)/.patched
 
 $(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,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \
+		$(LINUX_DIR)/Makefile \
+		$(LINUX_DIR)/arch/mips/Makefile
 	$(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
 	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/version.h
 	touch $(LINUX_DIR)/.configured
-- 
cgit v1.1