X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fimage%2Flegacy.mk;h=d2f05e993eab55e461ef6cb7a8f465ccd08a4cb0;hb=83783f296a18e6e481f23b2019575e45c437db4e;hp=f80b700be8e340cd6feb3d47e89e24d825995c52;hpb=236fcedc51d0b43701081ddde7af39e6a6cce0e7;p=librecmc%2Flibrecmc.git

diff --git a/target/linux/ar71xx/image/legacy.mk b/target/linux/ar71xx/image/legacy.mk
index f80b700be8..d2f05e993e 100644
--- a/target/linux/ar71xx/image/legacy.mk
+++ b/target/linux/ar71xx/image/legacy.mk
@@ -761,24 +761,24 @@ define Image/Build/NetgearNAND
 	$(call Image/Build/SysupgradeNAND,$(2),squashfs,$(KDIR_TMP)/vmlinux-$(2).uImage)
 endef
 
+ZYXEL_UBOOT = $(KDIR)/u-boot-nbg460n_550n_550nh.bin
+ZYXEL_UBOOT_BIN = $(wildcard $(BIN_DIR)/u-boot-nbg460n_550n_550nh/u-boot.bin)
 
-ifdef CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh
-  Image/Build/ZyXEL/buildkernel=$(call MkuImageLzma,$(2),$(3))
+Image/Build/ZyXEL/buildkernel=$(call MkuImageLzma,$(2),$(3))
 
-  define Image/Build/ZyXEL
+define Image/Build/ZyXEL
 	$(call Sysupgrade/KRuImage,$(1),$(2),917504,2752512)
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
-		if [ ! -f $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin ]; then \
-			echo "Warning: $(IMG_PREFIX)-$(2)-u-boot.bin not found" >&2; \
+		if [ ! -f $(ZYXEL_UBOOT) ]; then \
+			echo "Warning: $(ZYXEL_UBOOT) not found" >&2; \
 		else \
 			$(STAGING_DIR_HOST)/bin/mkzynfw \
 				-B $(4) \
-				-b $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin \
+				-b $(ZYXEL_UBOOT) \
 				-r $(call sysupname,$(1),$(2)):0x10000 \
 				-o $(call factoryname,$(1),$(2)); \
 	fi; fi
-  endef
-endif
+endef
 
 define	Image/Build/ZyXELNAND/buildkernel
 	$(eval kernelsize=$(call mtdpartsize,kernel,$(5)))
@@ -1044,6 +1044,7 @@ define Image/Build/squashfs
 endef
 
 define Image/Prepare
+	$(if $(wildcard $(ZYXEL_UBOOT_BIN)),cp $(ZYXEL_UBOOT_BIN) $(ZYXEL_UBOOT))
 	$(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma)
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
 	$(call CompressLzma,$(KDIR)/vmlinux-initramfs,$(KDIR)/vmlinux-initramfs.bin.lzma)