Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <javier.viguera@digi.com>
Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://onedigi.atlassian.net/browse/DEL-8268
This commit is contained in:
Hector Palacios 2023-01-02 16:58:32 +01:00
parent 99cdcae9bb
commit c21dac88a6
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta-digi-arm/classes/boot-artifacts.bbclass
View File

@ -35,19 +35,18 @@ def get_bootable_artifacts(d):
uboot_prefix = d.getVar('UBOOT_PREFIX', True) or "" uboot_prefix = d.getVar('UBOOT_PREFIX', True) or ""
uboot_suffix = d.getVar('UBOOT_SUFFIX', True) or "" uboot_suffix = d.getVar('UBOOT_SUFFIX', True) or ""
atf_types = d.getVar('TF_A_CONFIG', True) or "" atf_types = d.getVar('TF_A_CONFIG', True) or ""
fip_type = d.getVar('FIP_UBOOT_CONFIG', True) or ""
atf_boot_modes = ['nand'] atf_boot_modes = ['nand']
artifacts = [] artifacts = []
# For platforms with a FIP artifact, ignore u-boot 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 "" machine = d.getVar('MACHINE', True) or ""
# Add ATF artifacts # Add ATF artifacts
for t in atf_types.split(" "): for t in atf_types.split(" "):
if t in atf_boot_modes: if t in atf_boot_modes:
artifacts.append("arm-trusted-firmware/tf-a-%s-%s.stm32" % (machine, t)) artifacts.append("arm-trusted-firmware/tf-a-%s-%s.stm32" % (machine, t))
# Add FIP artifact # Add FIP artifact
artifacts.append("fip/fip-%s-%s.bin" % (machine, fip_type)) artifacts.append("fip/fip-%s.bin" % (machine))
return " ".join(artifacts) return " ".join(artifacts)
# For platforms without RAM_CONFIGS, build the artifacts from UBOOT_CONFIG # For platforms without RAM_CONFIGS, build the artifacts from UBOOT_CONFIG

1
meta-digi-arm/conf/machine/ccmp13-dvk.conf
View File

@ -32,7 +32,6 @@ UBOOT_SUFFIX = "bin"
# Set U-Boot FIP settings # Set U-Boot FIP settings
FIP_UBOOT_DTB = "u-boot" FIP_UBOOT_DTB = "u-boot"
FIP_UBOOT_CONFIG = "optee"
# ========================================================================= # =========================================================================
# Machine settings # Machine settings

1
meta-digi-arm/conf/machine/ccmp15-dvk.conf
View File

@ -32,7 +32,6 @@ UBOOT_SUFFIX = "bin"
# Set U-Boot FIP settings # Set U-Boot FIP settings
FIP_UBOOT_DTB = "u-boot" FIP_UBOOT_DTB = "u-boot"
FIP_UBOOT_CONFIG = "optee"
# ========================================================================= # =========================================================================
# Machine settings # Machine settings

2
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc
View File

@ -185,7 +185,7 @@ do_deploy:append:ccimx8m() {
do_deploy:append:ccmp1() { do_deploy:append:ccmp1() {
# Deploy u-boot-nodtb.bin and ccmp1x-dvk.dtb, to be packaged in fip binary by tf-a # Deploy u-boot-nodtb.bin and ccmp1x-dvk.dtb, to be packaged in fip binary by tf-a
install -d ${DEPLOYDIR}/${BOOT_TOOLS} 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 install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin
} }