From 8ed372b0212258a1f7189cac647335c45b41c61c Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Fri, 31 May 2024 11:25:13 +0200 Subject: [PATCH] bsp: u-boot: rework BL31 in EXTRA_OEMAKE By making use of the newly added rockchip MACHINEOVERRIDES as well as SOC_FAMILY, the logic can be drastically simplified in addition to not needing to update BL31 for new SoCs. Signed-off-by: Quentin Schulz --- recipes-bsp/u-boot/u-boot_%.bbappend | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 7d2e4a0..c78c86f 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -7,21 +7,15 @@ DEPENDS:append:rk3308 = " u-boot-tools-native" DEPENDS:append:rock-pi-4 = " gnutls-native" DEPENDS:append:rk-u-boot-env = " u-boot-mkenvimage-native" -EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf" -EXTRA_OEMAKE:append:rk3308 = " \ - BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3308.elf \ - ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3308.bin \ - " -EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" -EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" -EXTRA_OEMAKE:append:rk3568 = " \ - BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3568.elf \ - ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3568.bin \ - " -EXTRA_OEMAKE:append:rk3588s = " \ - BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf \ - ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin \ - " +BL31:rockchip:aarch64 = "${DEPLOY_DIR_IMAGE}/bl31-${SOC_FAMILY}.elf" +# SOC_FAMILY for RK3588S is rk3588s but it should use the binaries from rk3588 +BL31:rk3588s = "${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf" +EXTRA_OEMAKE:append:rockchip:aarch64 = " BL31=${BL31}" + +# No open-source TPL (yet) +EXTRA_OEMAKE:append:rk3308 = " ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3308.bin" +EXTRA_OEMAKE:append:rk3568 = " ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3568.bin" +EXTRA_OEMAKE:append:rk3588s = " ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin" INIT_FIRMWARE_DEPENDS ??= "" INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy"