enable squashfs in the magicbox kernel (not used yet), magicbox build now no longer...

SVN-Revision: 4753

diff --git a/openwrt/target/Config.in b/openwrt/target/Config.in
index fc35a9acc079f16c98606eb4734e5d686469572a..6b317dd881e36df4c3e8b51c6ac3a5972537f924 100644 (file)
--- 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 f0b19b1d231042479b85ef6b55c5131a97cf8510..10f71df2a99f2a125b75430a2b998fe7b57a5420 100644 (file)
--- 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 efd3f5867ef3c8b33d1fb826c9274a3780b26601..1f7f591bb30dbf549d01c311667969fdee983fd8 100644 (file)
--- 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