diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-03-03 02:44:10 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-03-03 02:44:10 +0000 |
| commit | 113c33218bee58084f41f4980b56388d0fe30f30 (patch) | |
| tree | ca25eb84f47cb93a9de4df4731c93d324c078694 /openwrt/package/linux | |
| parent | e02839854637ef6f521463ffc3007ec1513a88b2 (diff) | |
target/jffs2/blocksize.mk for setting block size (req. for wrt54g)
squashfs removed in favor of squashfs-lzma
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@301 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/linux')
| -rw-r--r-- | openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 | bin | 0 -> 5730 bytes | |||
| -rw-r--r-- | openwrt/package/linux/linux.config | 2 | ||||
| -rw-r--r-- | openwrt/package/linux/linux.mk | 14 |
3 files changed, 4 insertions, 12 deletions
diff --git a/openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 b/openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 Binary files differnew file mode 100644 index 0000000000..8e19292c1e --- /dev/null +++ b/openwrt/package/linux/kernel-patches/600-linux-squashfs-lzma.bz2 diff --git a/openwrt/package/linux/linux.config b/openwrt/package/linux/linux.config index de477721ae..761906ae5d 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 bead2226a6..6e3f7a4d27 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 |