From aae15e51565bbe5317c96131753226392dacaf2f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 5 Sep 2006 00:45:03 +0000 Subject: [PATCH] enable squashfs in the magicbox kernel (not used yet), magicbox build now no longer broken (images work well with jffs2) SVN-Revision: 4753 --- openwrt/target/Config.in | 1 - openwrt/target/image/magicbox/Makefile | 14 ++++++++++---- openwrt/target/linux/magicbox-2.6/config | 5 ++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/openwrt/target/Config.in b/openwrt/target/Config.in index fc35a9acc0..6b317dd881 100644 --- a/openwrt/target/Config.in +++ b/openwrt/target/Config.in @@ -79,7 +79,6 @@ config LINUX_2_6_XSCALE config LINUX_2_6_MAGICBOX bool "Magicbox [2.6]" - depends BROKEN select powerpc select LINUX_2_6 select BIG_ENDIAN diff --git a/openwrt/target/image/magicbox/Makefile b/openwrt/target/image/magicbox/Makefile index f0b19b1d23..10f71df2a9 100644 --- a/openwrt/target/image/magicbox/Makefile +++ b/openwrt/target/image/magicbox/Makefile @@ -22,11 +22,17 @@ define Image/Build endef define Image/Build/jffs2-64k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=65536 conv=sync + ( \ + dd if=$(LINUX_DIR)/arch/ppc/boot/images/uImage bs=65536 conv=sync; \ + dd if=$(KDIR)/root.$(1) bs=65536 conv=sync; \ + ) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img endef -define Image/Build/jffs2-128k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=131072 conv=sync -endef +#define Image/Build/jffs2-128k +# ( \ +# dd if=$(LINUX_DIR)/arch/ppc/boot/images/uImage bs=131072 conv=sync; \ +# dd if=$(KDIR)/root.$(1) bs=131072 conv=sync; \ +# ) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img +#endef $(eval $(call BuildImage)) diff --git a/openwrt/target/linux/magicbox-2.6/config b/openwrt/target/linux/magicbox-2.6/config index efd3f5867e..1f7f591bb3 100644 --- a/openwrt/target/linux/magicbox-2.6/config +++ b/openwrt/target/linux/magicbox-2.6/config @@ -1004,7 +1004,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set # CONFIG_CRAMFS is not set -# CONFIG_SQUASHFS is not set +CONFIG_SQUASHFS=y +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set -- 2.30.2