diff options
| author | Robert Marko | 2025-04-04 09:55:08 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-10-22 16:19:37 +0000 |
| commit | c5d7ef41f87bcf7b0067bdfd81b2f2572bc3c3a9 (patch) | |
| tree | 51e86a5301bb27af327c6be4921d137da149e4e0 | |
| parent | be73a7f033174eeba36b0a5c950aa0d58fbdee3c (diff) | |
| download | openwrt-c5d7ef41f87bcf7b0067bdfd81b2f2572bc3c3a9.tar.gz | |
at91: put u-boot images into image staging directory
Currently, building at91 subtargets via image builder will fail as the
required built u-boot is not present in the image builder at all since its
presumed to be in the binary directory which obviously does not exist yet.
So, lets install the u-boot binary into image staging directory and use
that instead.
Link: https://github.com/openwrt/openwrt/pull/18414
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit 4724331d7037e61527e7da7253cdaa4a90b1d302)
| -rw-r--r-- | package/boot/uboot-at91/Makefile | 5 | ||||
| -rw-r--r-- | target/linux/at91/image/sam9x.mk | 2 | ||||
| -rw-r--r-- | target/linux/at91/image/sama5.mk | 2 | ||||
| -rw-r--r-- | target/linux/at91/image/sama7.mk | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index 81ea22ded6..67c9d8f365 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -179,4 +179,9 @@ define Build/Compile $(UBOOT_MAKE_FLAGS) endef +define Build/InstallDev + $(INSTALL_DIR) $(STAGING_DIR_IMAGE) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(UBOOT_IMAGE) +endef + $(eval $(call BuildPackage/U-Boot)) diff --git a/target/linux/at91/image/sam9x.mk b/target/linux/at91/image/sam9x.mk index d0722c5d30..009a41b303 100644 --- a/target/linux/at91/image/sam9x.mk +++ b/target/linux/at91/image/sam9x.mk @@ -16,7 +16,7 @@ define Build/at91-sdcard ::$(DEVICE_NAME)-fit.itb mcopy -i $@.boot \ - $(BIN_DIR)/u-boot-$(if $(findstring sam9x60,$@),$(DEVICE_DTS:at91-%=%),at91sam9x5ek)_mmc/u-boot.bin \ + $(STAGING_DIR_IMAGE)/$(if $(findstring sam9x60,$@),$(DEVICE_DTS:at91-%=%),at91sam9x5ek)_mmc-u-boot.bin \ ::u-boot.bin mcopy -i $@.boot \ diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk index 7f4dd3316a..036cac4de9 100644 --- a/target/linux/at91/image/sama5.mk +++ b/target/linux/at91/image/sama5.mk @@ -16,7 +16,7 @@ define Build/at91-sdcard ::$(DEVICE_NAME)-fit.itb mcopy -i $@.boot \ - $(BIN_DIR)/u-boot-$(DEVICE_DTS:at91-%=%)_mmc/u-boot.bin \ + $(STAGING_DIR_IMAGE)/$(DEVICE_DTS:at91-%=%)_mmc-u-boot.bin \ ::u-boot.bin $(if $(findstring sama5d4-xplained,$@), \ diff --git a/target/linux/at91/image/sama7.mk b/target/linux/at91/image/sama7.mk index 8d6f67d80e..29043050ed 100644 --- a/target/linux/at91/image/sama7.mk +++ b/target/linux/at91/image/sama7.mk @@ -16,7 +16,7 @@ define Build/at91-sdcard ::$(DEVICE_NAME)-fit.itb mcopy -i $@.boot \ - $(BIN_DIR)/u-boot-$(DEVICE_DTS:at91-%=%)_mmc1/u-boot.bin \ + $(STAGING_DIR_IMAGE)/$(DEVICE_DTS:at91-%=%)_mmc1-u-boot.bin \ ::u-boot.bin mcopy -i $@.boot \ |