aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2019-01-04 21:17:20 +0100
committerChristian Lamparter <chunkeey@gmail.com>2019-01-06 12:26:12 +0100
commit634c733065256979835ca3d7218ae8203a693683 (patch)
tree4f1c1ca95911395dabb60d793b8e11023337de69 /package
parentbbe7ad5a2f0ba298dcc78fc9000cfff25c198a5a (diff)
downloadupstream-634c733065256979835ca3d7218ae8203a693683.tar.gz
upstream-634c733065256979835ca3d7218ae8203a693683.tar.bz2
upstream-634c733065256979835ca3d7218ae8203a693683.zip
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 <mail@david-bauer.net>
Diffstat (limited to 'package')
-rw-r--r--package/boot/uboot-fritz4040/Makefile8
1 files changed, 7 insertions, 1 deletions
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)/