From 634c733065256979835ca3d7218ae8203a693683 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 4 Jan 2019 21:17:20 +0100 Subject: ipq40xx: copy Fritz4040 UBoot to STAGING_DIR_IMAGE Copy U-Boot to STAGING_DIR_IMAGE (and append it to the EVA-image from there) to fix image generation using the image-builder. Also remove the bootloader from DEVICE_PACKAGES and instead use the BUILD_DEVICES directive from within the U-Boot makefile. This fixes eva-image generation using the OpenWRT image-builder. Signed-off-by: David Bauer --- package/boot/uboot-fritz4040/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'package/boot/uboot-fritz4040/Makefile') diff --git a/package/boot/uboot-fritz4040/Makefile b/package/boot/uboot-fritz4040/Makefile index 3d8c8fb4bb..f48d5d5c13 100644 --- a/package/boot/uboot-fritz4040/Makefile +++ b/package/boot/uboot-fritz4040/Makefile @@ -21,11 +21,12 @@ include $(INCLUDE_DIR)/package.mk define U-Boot/Default BUILD_TARGET:=ipq40xx - UBOOT_IMAGE:=uboot-fritz4040.bin endef define U-Boot/fritz4040 NAME:=FritzBox 4040 + UBOOT_IMAGE:=uboot-fritz4040.bin + BUILD_DEVICES:=avm_fritzbox-4040 endef UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes @@ -44,6 +45,11 @@ define Build/Compile (cd $(PKG_BUILD_DIR); ./fritz/fritzcreator.sh;) endef +define Build/InstallDev + $(INSTALL_DIR) $(STAGING_DIR_IMAGE) + $(CP) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(UBOOT_IMAGE) +endef + define Package/u-boot/install $(Package/u-boot/install/default) $(INSTALL_BIN) $(PKG_BUILD_DIR)/upload-to-f4040.sh $(1)/ -- cgit v1.2.3