diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-01-23 08:23:55 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-01-24 16:21:24 +0100 |
| commit | 83783f296a18e6e481f23b2019575e45c437db4e (patch) | |
| tree | 75d072cd86d6bd875e332f6164c5124b7b28ea14 /target/linux/ar71xx | |
| parent | b27241a1a1b70e6b84f76b2233283f7ec727c224 (diff) | |
| download | upstream-83783f296a18e6e481f23b2019575e45c437db4e.tar.gz upstream-83783f296a18e6e481f23b2019575e45c437db4e.tar.bz2 upstream-83783f296a18e6e481f23b2019575e45c437db4e.zip | |
uboot-ar71xx: switch to using u-boot.mk
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/image/legacy.mk | 17 |
1 files changed, 9 insertions, 8 deletions
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) |