From dcb1c87a2a608915947927cfe0906097b4ad3ed2 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 5 Sep 2006 00:45:03 +0000
Subject: enable squashfs in the magicbox kernel (not used yet), magicbox build
 now no longer broken (images work well with jffs2)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4753 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/Config.in                 |  1 -
 target/image/magicbox/Makefile   | 14 ++++++++++----
 target/linux/magicbox-2.6/config |  5 ++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'target')

diff --git a/target/Config.in b/target/Config.in
index fc35a9acc..6b317dd88 100644
--- 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]"
-	depends BROKEN
 	select powerpc
 	select LINUX_2_6
 	select BIG_ENDIAN
diff --git a/target/image/magicbox/Makefile b/target/image/magicbox/Makefile
index f0b19b1d2..10f71df2a 100644
--- a/target/image/magicbox/Makefile
+++ b/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/target/linux/magicbox-2.6/config b/target/linux/magicbox-2.6/config
index efd3f5867..1f7f591bb 100644
--- 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_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
-- 
cgit v1.2.3