add ar7-2.6 fixes by Stefan Weil

[openwrt.git] / target / linux / magicbox-2.6 / image / Makefile

diff --git a/target/linux/magicbox-2.6/image/Makefile b/target/linux/magicbox-2.6/image/Makefile
index 10f71df..f99590f 100644 (file)
--- a/target/linux/magicbox-2.6/image/Makefile
+++ b/target/linux/magicbox-2.6/image/Makefile
@@ -7,14 +7,12 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 

-define Build/Clean
-endef
-

 define Image/Prepare
 define Image/Prepare

+       cp $(LINUX_DIR)/arch/ppc/boot/images/uImage $(KDIR)/uImage

 endef
 
 define Image/BuildKernel
 endef
 
 define Image/BuildKernel

-       cp $(LINUX_DIR)/arch/ppc/boot/images/uImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-uImage
+       cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-uImage

 endef
 
 define Image/Build
 endef
 
 define Image/Build


@@ -23,16 +21,17 @@ endef
 
 define Image/Build/jffs2-64k
        ( \
 
 define Image/Build/jffs2-64k
        ( \

-               dd if=$(LINUX_DIR)/arch/ppc/boot/images/uImage bs=65536 conv=sync; \
+               dd if=$(KDIR)/uImage bs=1024k conv=sync; \

                dd if=$(KDIR)/root.$(1) bs=65536 conv=sync; \
        ) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img
 endef
 
                dd if=$(KDIR)/root.$(1) bs=65536 conv=sync; \
        ) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img
 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
+define Image/Build/squashfs
+       $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+       ( \
+               dd if=$(LINUX_DIR)/arch/ppc/boot/images/uImage bs=1024k conv=sync; \
+               dd if=$(KDIR)/root.$(1) bs=65536 conv=sync; \
+       ) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img
+endef

 
 $(eval $(call BuildImage))
 
 $(eval $(call BuildImage))