From 4c2d8b66c9ccbf1e5ae4d9baf19921613cece6fc Mon Sep 17 00:00:00 2001 From: Jesse R Codling Date: Tue, 5 Aug 2025 11:39:41 -0400 Subject: [PATCH] set ROCKCHIP_TPL unconditionally for binman builds required for boards with u-boot option CONFIG_ROCKCHIP_EXTERNAL_TPL, should be ignored for boards without. See armbian/build#8449 --- config/sources/families/include/rockchip64_common.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index 6e23210896..fd8dd53fac 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -175,8 +175,9 @@ prepare_boot_configuration() { [[ $BOOT_SCENARIO == tpl-blob-atf-mainline ]] && UBOOT_TARGET_MAP="BL31=bl31.elf idbloader.img u-boot.itb;;idbloader.img u-boot.itb" [[ $BOOT_SCENARIO == binman-atf-mainline ]] && - UBOOT_TARGET_MAP="BL31=bl31.elf;;u-boot-rockchip.bin" + UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin" # binman builds do not have separate build targets for idbloader.img and u-boot.itb + # ROCKCHIP_TPL needed for boards with CONFIG_ROCKCHIP_EXTERNAL_TPL, ignored for boards without it ;; tpl-spl-blob) UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB idbloader.img u-boot.itb;;idbloader.img u-boot.itb"