From 89aecaade98248b1ea06d365ac4248d5068bc195 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Mon, 2 Oct 2023 20:27:18 -0400 Subject: [PATCH] u-boot cleanup: group dependencies Group the INIT_FIRMWARE_DEPENDS together and sort. Reviewed-by: Quentin Schulz Signed-off-by: Trevor Woerner --- recipes-bsp/u-boot/u-boot%.bbappend | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-boot%.bbappend index c8444aa..8c6ac86 100644 --- a/recipes-bsp/u-boot/u-boot%.bbappend +++ b/recipes-bsp/u-boot/u-boot%.bbappend @@ -2,21 +2,20 @@ DEPENDS:append:rock-pi-4 = " gnutls-native" # various machines require the pyelftools library for parsing dtb files DEPENDS:append = " python3-pyelftools-native" -INIT_FIRMWARE_DEPENDS ??= "" - EXTRA_OEMAKE:append:rk3588s = " \ BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf \ ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin \ " -INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy" EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" -INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy" EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" -INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy" EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf" -INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy" +INIT_FIRMWARE_DEPENDS ??= "" +INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy" do_compile[depends] .= "${INIT_FIRMWARE_DEPENDS}" do_compile:append:rock2-square () {