summaryrefslogtreecommitdiffstats
path: root/target/image
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-09-05 00:45:03 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-09-05 00:45:03 +0000
commitdcb1c87a2a608915947927cfe0906097b4ad3ed2 (patch)
tree37cd83e064df1603b31f09bd53048496c73360e9 /target/image
parent6c87a8b8776b202a6c6eb913b8dbea80654e30dc (diff)
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
Diffstat (limited to 'target/image')
-rw-r--r--target/image/magicbox/Makefile14
1 files changed, 10 insertions, 4 deletions
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))