From c21dac88a6b3f3b249f6d1ff14f9efef03bfd493 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 2 Jan 2023 16:58:32 +0100 Subject: [PATCH] uboot: ccmp1: remove deprecated FIP_UBOOT_CONFIG This variable was removed from meta-st-stm32mp so we need to get rid of it in meta-digi, too. Reported-by: Javier Viguera Signed-off-by: Hector Palacios https://onedigi.atlassian.net/browse/DEL-8268 --- meta-digi-arm/classes/boot-artifacts.bbclass | 5 ++--- meta-digi-arm/conf/machine/ccmp13-dvk.conf | 1 - meta-digi-arm/conf/machine/ccmp15-dvk.conf | 1 - meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/classes/boot-artifacts.bbclass b/meta-digi-arm/classes/boot-artifacts.bbclass index 37cf486ed..964f68575 100644 --- a/meta-digi-arm/classes/boot-artifacts.bbclass +++ b/meta-digi-arm/classes/boot-artifacts.bbclass @@ -35,19 +35,18 @@ def get_bootable_artifacts(d): uboot_prefix = d.getVar('UBOOT_PREFIX', True) or "" uboot_suffix = d.getVar('UBOOT_SUFFIX', True) or "" atf_types = d.getVar('TF_A_CONFIG', True) or "" - fip_type = d.getVar('FIP_UBOOT_CONFIG', True) or "" atf_boot_modes = ['nand'] artifacts = [] # For platforms with a FIP artifact, ignore u-boot artifacts - if fip_type != "": + if d.getVar('FIP_UBOOT_DTB') != "": machine = d.getVar('MACHINE', True) or "" # Add ATF artifacts for t in atf_types.split(" "): if t in atf_boot_modes: artifacts.append("arm-trusted-firmware/tf-a-%s-%s.stm32" % (machine, t)) # Add FIP artifact - artifacts.append("fip/fip-%s-%s.bin" % (machine, fip_type)) + artifacts.append("fip/fip-%s.bin" % (machine)) return " ".join(artifacts) # For platforms without RAM_CONFIGS, build the artifacts from UBOOT_CONFIG diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index 9baf6383a..baa634121 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -32,7 +32,6 @@ UBOOT_SUFFIX = "bin" # Set U-Boot FIP settings FIP_UBOOT_DTB = "u-boot" -FIP_UBOOT_CONFIG = "optee" # ========================================================================= # Machine settings diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 4745613cf..5690510a2 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -32,7 +32,6 @@ UBOOT_SUFFIX = "bin" # Set U-Boot FIP settings FIP_UBOOT_DTB = "u-boot" -FIP_UBOOT_CONFIG = "optee" # ========================================================================= # Machine settings diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc index 013b8f913..021ed7796 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -185,7 +185,7 @@ do_deploy:append:ccimx8m() { do_deploy:append:ccmp1() { # Deploy u-boot-nodtb.bin and ccmp1x-dvk.dtb, to be packaged in fip binary by tf-a install -d ${DEPLOYDIR}/${BOOT_TOOLS} - install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}/${FIP_UBOOT_DTB}-${FIP_UBOOT_HEADER}-${FIP_UBOOT_CONFIG}.dtb + install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}/${FIP_UBOOT_DTB}-${FIP_UBOOT_HEADER}.dtb install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin }