diff options
| author | Robert Marko | 2025-04-04 10:25:21 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-04-04 12:39:00 +0000 |
| commit | a947be41b721a7c521d23981adaf06ebd1ef5dfe (patch) | |
| tree | ea89b9273a508821472b3d2e54ed6ac1460eceda | |
| parent | 4724331d7037e61527e7da7253cdaa4a90b1d302 (diff) | |
| download | openwrt-a947be41b721a7c521d23981adaf06ebd1ef5dfe.tar.gz | |
at91bootstrap: put at91bootstrap images into image staging directory
Currently, building at91 subtargets via image builder will fail as the
required built at91bootstrap 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 at91bootstrap 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>
| -rw-r--r-- | package/boot/at91bootstrap/Makefile | 5 | ||||
| -rw-r--r-- | target/linux/at91/image/sam9x.mk | 2 | ||||
| -rw-r--r-- | target/linux/at91/image/sama5.mk | 4 | ||||
| -rw-r--r-- | target/linux/at91/image/sama7.mk | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/package/boot/at91bootstrap/Makefile b/package/boot/at91bootstrap/Makefile index 456f9fa5ff..12b747c38d 100644 --- a/package/boot/at91bootstrap/Makefile +++ b/package/boot/at91bootstrap/Makefile @@ -201,4 +201,9 @@ define Build/Compile CROSS_COMPILE=$(TARGET_CROSS) endef +define Build/InstallDev + $(INSTALL_DIR) $(STAGING_DIR_IMAGE) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(BINARIES_DIR)/at91bootstrap.bin $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-at91bootstrap.bin +endef + $(eval $(call BuildPackage/AT91Bootstrap)) diff --git a/target/linux/at91/image/sam9x.mk b/target/linux/at91/image/sam9x.mk index 009a41b303..6f2ba19d9f 100644 --- a/target/linux/at91/image/sam9x.mk +++ b/target/linux/at91/image/sam9x.mk @@ -20,7 +20,7 @@ define Build/at91-sdcard ::u-boot.bin mcopy -i $@.boot \ - $(BIN_DIR)/at91bootstrap-$(if $(findstring sam9x60,$@),$(DEVICE_DTS:at91-%=%),at91sam9x5ek)sd_uboot/at91bootstrap.bin \ + $(STAGING_DIR_IMAGE)/$(if $(findstring sam9x60,$@),$(DEVICE_DTS:at91-%=%),at91sam9x5ek)sd_uboot-at91bootstrap.bin \ ::BOOT.bin $(CP) uboot-env.txt $@-uboot-env.txt diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk index 036cac4de9..268af5999c 100644 --- a/target/linux/at91/image/sama5.mk +++ b/target/linux/at91/image/sama5.mk @@ -21,10 +21,10 @@ define Build/at91-sdcard $(if $(findstring sama5d4-xplained,$@), \ mcopy -i $@.boot \ - $(BIN_DIR)/at91bootstrap-$(DEVICE_DTS:at91-%=%)sd_uboot_secure/at91bootstrap.bin \ + $(STAGING_DIR_IMAGE)/$(DEVICE_DTS:at91-%=%)sd_uboot_secure-at91bootstrap.bin \ ::BOOT.bin, mcopy -i $@.boot \ - $(BIN_DIR)/at91bootstrap-$(DEVICE_DTS:at91-%=%)sd_uboot/at91bootstrap.bin \ + $(STAGING_DIR_IMAGE)/$(DEVICE_DTS:at91-%=%)sd_uboot-at91bootstrap.bin \ ::BOOT.bin) $(CP) uboot-env.txt $@-uboot-env.txt diff --git a/target/linux/at91/image/sama7.mk b/target/linux/at91/image/sama7.mk index 29043050ed..924d950e22 100644 --- a/target/linux/at91/image/sama7.mk +++ b/target/linux/at91/image/sama7.mk @@ -20,7 +20,7 @@ define Build/at91-sdcard ::u-boot.bin mcopy -i $@.boot \ - $(BIN_DIR)/at91bootstrap-$(DEVICE_DTS:at91-%=%)sd_uboot/at91bootstrap.bin \ + $(STAGING_DIR_IMAGE)/$(DEVICE_DTS:at91-%=%)sd_uboot-at91bootstrap.bin \ ::BOOT.bin $(CP) uboot-env.txt $@-uboot-env.txt |