allow mkfwimage to fail during atheros builds.

[openwrt/svn-archive/archive.git] / target / linux / atheros / image / Makefile

diff --git a/target/linux/atheros/image/Makefile b/target/linux/atheros/image/Makefile
index 5cfa774041b0886f3d9a49ee7aac4995f5a3d0f6..343e2dedf70e6346fc9ff4f536b2f5f0cf1d4ec3 100644 (file)
--- a/target/linux/atheros/image/Makefile
+++ b/target/linux/atheros/image/Makefile
@@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 define Image/BuildKernel
 include $(INCLUDE_DIR)/image.mk
 
 define Image/BuildKernel

-       cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.elf
+       cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.elf

        gzip -9 -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
        $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.bin.l7
        gzip -9 -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
        $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.bin.l7

-       dd if=$(KDIR)/vmlinux.bin.l7 of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.lzma bs=65536 conv=sync
-       dd if=$(KDIR)/vmlinux.bin.gz of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.gz bs=65536 conv=sync
+       dd if=$(KDIR)/vmlinux.bin.l7 of=$(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma bs=65536 conv=sync
+       dd if=$(KDIR)/vmlinux.bin.gz of=$(BIN_DIR)/openwrt-$(BOARD)-vmlinux.gz bs=65536 conv=sync

 endef
 
 define Image/Build/squashfs
 endef
 
 define Image/Build/squashfs


@@ -21,8 +21,17 @@ endef
 
 define Image/Build
        $(call Image/Build/$(1))
 
 define Image/Build
        $(call Image/Build/$(1))

-       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-root.$(1) bs=128k conv=sync
-endef
+       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) bs=128k conv=sync

 
 

+       -$(STAGING_DIR_HOST)/bin/mkfwimage -k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \
+               -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
+               -v XS2.ar2316.OpenWRT \
+               -o $(BIN_DIR)/openwrt-$(BOARD)-ubnt2-$(1).bin
+       -$(STAGING_DIR_HOST)/bin/mkfwimage -k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \
+               -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
+               -v XS5.ar2313.OpenWRT \
+               -o $(BIN_DIR)/openwrt-$(BOARD)-ubnt5-$(1).bin \
+               -s 0xBE030000
+endef

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