X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Fimage%2Fmagicbox%2FMakefile;h=10f71df2a99f2a125b75430a2b998fe7b57a5420;hb=27c68c3f75771f74d66d70db613992b63b7fd1b9;hp=f0b19b1d231042479b85ef6b55c5131a97cf8510;hpb=3f494f8d220f2b1a40a6749e814b46eca48792ac;p=openwrt-10.03%2F.git

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))