diff options
| author | David Bauer <mail@david-bauer.net> | 2019-01-04 21:17:20 +0100 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2019-03-18 20:41:02 +0100 |
| commit | dcfca830a85690d6973bf065be0070ec56f8aeb6 (patch) | |
| tree | b5667b0dce17d8265b68353df85c7d78ecca75e4 | |
| parent | 400601f0e341115eb87fd73032c08559c30491ef (diff) | |
| download | upstream-dcfca830a85690d6973bf065be0070ec56f8aeb6.tar.gz upstream-dcfca830a85690d6973bf065be0070ec56f8aeb6.tar.bz2 upstream-dcfca830a85690d6973bf065be0070ec56f8aeb6.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>
(cherry picked from commit 634c733065256979835ca3d7218ae8203a693683)
| -rw-r--r-- | package/boot/uboot-fritz4040/Makefile | 8 | ||||
| -rw-r--r-- | target/linux/ipq40xx/image/Makefile | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/package/boot/uboot-fritz4040/Makefile b/package/boot/uboot-fritz4040/Makefile index 77d6fdc3b8..659bd0d084 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 @@ -45,6 +46,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) ./files/upload-to-f4040.sh $(1)/ diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index 38600cf979..90d9dfeff0 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -80,12 +80,12 @@ define Device/avm_fritzbox-4040 BOARD_NAME := fritz4040 DEVICE_TITLE := AVM Fritz!Box 4040 IMAGE_SIZE := 29753344 - UBOOT_PATH := $$(BIN_DIR)/u-boot-fritz4040/uboot-fritz4040.bin + UBOOT_PATH := $(STAGING_DIR_IMAGE)/uboot-fritz4040.bin UBOOT_PARTITION_SIZE := 524288 IMAGES = eva.bin sysupgrade.bin IMAGE/eva.bin := append-uboot | pad-to $$$$(UBOOT_PARTITION_SIZE) | append-kernel | append-rootfs | pad-rootfs IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - DEVICE_PACKAGES := fritz-tffs fritz-caldata u-boot-fritz4040 + DEVICE_PACKAGES := fritz-tffs fritz-caldata endef TARGET_DEVICES += avm_fritzbox-4040 |