uboot-d1: Adapt BUILD_DEVICES to renamed boards
Some checks are pending
Build all core packages / Build all core packages for selected target (push) Waiting to run

The boards where renamed, but BUILD_DEVICES was not adapted. This
variable points to the board name. Without this change the u-boot
binaries are not selected in the configuration.

Copy the u-boot binaries under the BUILD_DEVICES name as it is expected
by the image scripts.

Fixes: 33e23e8922 ("build: d1: add SUPPORTED_DEVICES")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit af6c1f9497)
This commit is contained in:
Hauke Mehrtens 2024-12-23 01:49:04 +01:00
parent 654c9732dc
commit d55754ce0d

View File

@ -30,7 +30,7 @@ define U-Boot/dongshan_nezha_stu
OPENSBI:=generic OPENSBI:=generic
DEPENDS:=+opensbi_generic DEPENDS:=+opensbi_generic
UBOOT_DTS:=sun20i-d1-dongshan-nezha-stu.dtb UBOOT_DTS:=sun20i-d1-dongshan-nezha-stu.dtb
BUILD_DEVICES:=dongshan_nezha_stu BUILD_DEVICES:=100ask_dongshan-nezha-stu
endef endef
define U-Boot/lichee_rv_dock define U-Boot/lichee_rv_dock
@ -38,7 +38,7 @@ define U-Boot/lichee_rv_dock
OPENSBI:=generic OPENSBI:=generic
DEPENDS:=+opensbi_generic DEPENDS:=+opensbi_generic
UBOOT_DTS:=sun20i-d1-lichee-rv-dock.dtb UBOOT_DTS:=sun20i-d1-lichee-rv-dock.dtb
BUILD_DEVICES:=lichee_rv_dock BUILD_DEVICES:=sipeed_lichee-rv-dock
endef endef
define U-Boot/mangopi_mq_pro define U-Boot/mangopi_mq_pro
@ -46,7 +46,7 @@ define U-Boot/mangopi_mq_pro
OPENSBI:=generic OPENSBI:=generic
DEPENDS:=+opensbi_generic DEPENDS:=+opensbi_generic
UBOOT_DTS:=sun20i-d1-mangopi-mq-pro.dtb UBOOT_DTS:=sun20i-d1-mangopi-mq-pro.dtb
BUILD_DEVICES:=mangopi_mq_pro BUILD_DEVICES:=widora_mangopi-mq-pro
endef endef
define U-Boot/nezha define U-Boot/nezha
@ -54,7 +54,7 @@ define U-Boot/nezha
OPENSBI:=generic OPENSBI:=generic
DEPENDS:=+opensbi_generic DEPENDS:=+opensbi_generic
UBOOT_DTS:=sun20i-d1-nezha.dtb UBOOT_DTS:=sun20i-d1-nezha.dtb
BUILD_DEVICES:=nezha BUILD_DEVICES:=allwinner_d1-nezha
endef endef
UBOOT_TARGETS := \ UBOOT_TARGETS := \
@ -74,7 +74,7 @@ endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR_IMAGE) $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(DTS_DIR)/$(UBOOT_DTS) $(STAGING_DIR_IMAGE)/$(UBOOT_DTS) $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(DTS_DIR)/$(UBOOT_DTS) $(STAGING_DIR_IMAGE)/$(UBOOT_DTS)
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(UBOOT_IMAGE) $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)-$(UBOOT_IMAGE)
mkimage -C none -A riscv -T script -d uEnv-$(UENV).txt \ mkimage -C none -A riscv -T script -d uEnv-$(UENV).txt \
$(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)-boot.scr $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)-boot.scr
endef endef