ar71xx: stop image building if a loader is missing

[openwrt.git] / target / linux / ar71xx / image / Makefile

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 2cde9cb..8fcaa08 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -273,7 +273,7 @@ define Image/Build/UBNTXM
        $(call Sysupgrade/KRuImage,$(1),$(2),1048576,6684672)
        dd if=$(KDIR_TMP)/vmlinux-$(2).uImage of=$(KDIR_TMP)/vmlinux-$(2).uImage.bin bs=1024k conv=sync
        -$(STAGING_DIR_HOST)/bin/mkfwimage \
        $(call Sysupgrade/KRuImage,$(1),$(2),1048576,6684672)
        dd if=$(KDIR_TMP)/vmlinux-$(2).uImage of=$(KDIR_TMP)/vmlinux-$(2).uImage.bin bs=1024k conv=sync
        -$(STAGING_DIR_HOST)/bin/mkfwimage \

-               -B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
+               -B $(4) -v $(5).$(6).v6.0.0-OpenWrt-$(REVISION) \

                -k $(KDIR_TMP)/vmlinux-$(2).uImage.bin \
                -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
                -o $(call factoryname,$(1),$(2))
                -k $(KDIR_TMP)/vmlinux-$(2).uImage.bin \
                -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
                -o $(call factoryname,$(1),$(2))


@@ -299,6 +299,7 @@ define Image/Build/Planex/loader
 endef
 
 define Image/Build/Planex
 endef
 
 define Image/Build/Planex

+       [ -e "$(KDIR)/loader-$(2).gz" ]

        $(call MkuImage,gzip,,$(KDIR)/loader-$(2).gz,$(KDIR_TMP)/vmlinux-$(2).uImage)
        $(call MkuImageOKLI,$(2))
        ( \
        $(call MkuImage,gzip,,$(KDIR)/loader-$(2).gz,$(KDIR_TMP)/vmlinux-$(2).uImage)
        $(call MkuImageOKLI,$(2))
        ( \


@@ -338,6 +339,7 @@ define Image/Build/TPLINKOLD/loader
 endef
 
 define Image/Build/TPLINKOLD
 endef
 
 define Image/Build/TPLINKOLD

+       [ -e "$(KDIR)/loader-$(2).gz" ]

        $(call MkuImageOKLI,$(2))
        ( \
                dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \
        $(call MkuImageOKLI,$(2))
        ( \
                dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \


@@ -368,6 +370,7 @@ define Image/Build/TPLINK/loader
 endef
 
 define Image/Build/TPLINK
 endef
 
 define Image/Build/TPLINK

+       [ -e "$(KDIR)/loader-$(2).gz" ]

        $(call MkuImageOKLI,$(2))
        ( \
                dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \
        $(call MkuImageOKLI,$(2))
        ( \
                dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \


@@ -698,6 +701,11 @@ define Image/Build/Profile/DIR600A1
        $(call Image/Build/Template/$(fs_64k)/$(1),Cameo7240,dir-600-a1,$(dir600a1_cmdline),"AP91-AR7240-RT-090223-00")
 endef
 
        $(call Image/Build/Template/$(fs_64k)/$(1),Cameo7240,dir-600-a1,$(dir600a1_cmdline),"AP91-AR7240-RT-090223-00")
 endef
 

+dir601a1_cmdline=board=DIR-600-A1 console=ttyS0,115200
+define Image/Build/Profile/DIR601A1
+       $(call Image/Build/Template/$(fs_64k)/$(1),Cameo7240,dir-601-a1,$(dir600a1_cmdline),"AP91-AR7240-RT-090223-02")
+endef
+

 dir615e4_cmdline=board=DIR-615-E4 console=ttyS0,115200
 define Image/Build/Profile/DIR615E4
        $(call Image/Build/Template/$(fs_64k)/$(1),Cameo7240,dir-615-e4,$(dir615e4_cmdline),"AP99-AR7240-RT-091105-05")
 dir615e4_cmdline=board=DIR-615-E4 console=ttyS0,115200
 define Image/Build/Profile/DIR615E4
        $(call Image/Build/Template/$(fs_64k)/$(1),Cameo7240,dir-615-e4,$(dir615e4_cmdline),"AP99-AR7240-RT-091105-05")


@@ -776,22 +784,22 @@ endef
 
 ubntbulletm_cmdline=board=UBNT-BM console=ttyS0,115200
 define Image/Build/Profile/UBNTBULLETM
 
 ubntbulletm_cmdline=board=UBNT-BM console=ttyS0,115200
 define Image/Build/Profile/UBNTBULLETM

-       $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-bullet-m,$(ubntbulletm_cmdline),XM,UBNTXM,ar7240)
+       $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-bullet-m,$(ubntbulletm_cmdline),XM,XM,ar7240)

 endef
 
 ubntrocketm_cmdline=board=UBNT-RM console=ttyS0,115200
 define Image/Build/Profile/UBNTROCKETM
 endef
 
 ubntrocketm_cmdline=board=UBNT-RM console=ttyS0,115200
 define Image/Build/Profile/UBNTROCKETM

-       $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-rocket-m,$(ubntrocketm_cmdline),XM,UBNTXM,ar7240)
+       $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-rocket-m,$(ubntrocketm_cmdline),XM,XM,ar7240)

 endef
 
 ubntnanom_cmdline=board=UBNT-NM console=ttyS0,115200
 define Image/Build/Profile/UBNTNANOM
 endef
 
 ubntnanom_cmdline=board=UBNT-NM console=ttyS0,115200
 define Image/Build/Profile/UBNTNANOM

-       $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-nano-m,$(ubntnanom_cmdline),XM,UBNTXM,ar7240)
+       $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-nano-m,$(ubntnanom_cmdline),XM,XM,ar7240)

 endef
 
 ubntunifi_cmdline=board=UBNT-UF console=ttyS0,115200
 define Image/Build/Profile/UBNTUNIFI
 endef
 
 ubntunifi_cmdline=board=UBNT-UF console=ttyS0,115200
 define Image/Build/Profile/UBNTUNIFI

-       $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-unifi,$(ubntunifi_cmdline),XM,UBNTXM,ar7240)
+       $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-unifi,$(ubntunifi_cmdline),XM,XM,ar7240)

 endef
 
 define Image/Build/Profile/UBNT
 endef
 
 define Image/Build/Profile/UBNT


@@ -1009,6 +1017,7 @@ define Image/Build/Profile/Default
        $(call Image/Build/Profile/A02RBW300N,$(1))
        $(call Image/Build/Profile/DB120,$(1))
        $(call Image/Build/Profile/DIR600A1,$(1))
        $(call Image/Build/Profile/A02RBW300N,$(1))
        $(call Image/Build/Profile/DB120,$(1))
        $(call Image/Build/Profile/DIR600A1,$(1))

+       $(call Image/Build/Profile/DIR601A1,$(1))

        $(call Image/Build/Profile/DIR615C1,$(1))
        $(call Image/Build/Profile/DIR615E4,$(1))
        $(call Image/Build/Profile/DIR825B1,$(1))
        $(call Image/Build/Profile/DIR615C1,$(1))
        $(call Image/Build/Profile/DIR615E4,$(1))
        $(call Image/Build/Profile/DIR825B1,$(1))