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

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4753 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/Config.in b/target/Config.in
index fc35a9a..6b317dd 100644 (file)
--- a/target/Config.in
+++ b/target/Config.in
@@ -79,7 +79,6 @@ config LINUX_2_6_XSCALE
 
 config LINUX_2_6_MAGICBOX
        bool "Magicbox [2.6]"
 
 config LINUX_2_6_MAGICBOX
        bool "Magicbox [2.6]"

-       depends BROKEN

        select powerpc
        select LINUX_2_6
        select BIG_ENDIAN
        select powerpc
        select LINUX_2_6
        select BIG_ENDIAN

diff --git a/target/image/magicbox/Makefile b/target/image/magicbox/Makefile
index f0b19b1..10f71df 100644 (file)
--- a/target/image/magicbox/Makefile
+++ b/target/image/magicbox/Makefile
@@ -22,11 +22,17 @@ define Image/Build
 endef
 
 define Image/Build/jffs2-64k
 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
 
 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))
 
 $(eval $(call BuildImage))

diff --git a/target/linux/magicbox-2.6/config b/target/linux/magicbox-2.6/config
index efd3f58..1f7f591 100644 (file)
--- a/target/linux/magicbox-2.6/config
+++ b/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_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
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set