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

imx-boot: fix build of imx-boot artifacts 

Recently, meta-freescale backported the support to build multiple boot
artifacts. This clashes with the changes in our imx-boot bbappend,
so update the bbappend to make it compatible with the latest changes
in meta-freescale.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2023-10-09 15:52:21 +02:00
parent dde01fe03c
commit 2fd1dbfed7
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
View File

@ -1,4 +1,4 @@
# Copyright (C) 2022 Digi International # Copyright (C) 2022-2023 Digi International Inc.
FILESEXTRAPATHS:prepend := "${THISDIR}/files:" FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
@ -31,29 +31,24 @@ do_compile:append:ccimx8m() {
} }
do_compile:ccimx8x() { do_compile:ccimx8x() {
compile_${SOC_FAMILY} # Copy TEE binary to SoC target folder to mkimage
if ${DEPLOY_OPTEE}; then if ${DEPLOY_OPTEE}; then
cp ${DEPLOY_DIR_IMAGE}/tee.bin {BOOT_STAGING} cp ${DEPLOY_DIR_IMAGE}/tee.bin ${BOOT_STAGING}
fi fi
# mkimage for i.MX8 UBOOT_CONFIG_EXTRA="${UBOOT_CONFIG}"
UBOOT_NAME_EXTRA="u-boot-${MACHINE}.bin-${UBOOT_CONFIG_EXTRA}"
for target in ${IMXBOOT_TARGETS}; do for target in ${IMXBOOT_TARGETS}; do
compile_${SOC_FAMILY}
for rev in ${SOC_REVISIONS}; do for rev in ${SOC_REVISIONS}; do
bbnote "building ${IMX_BOOT_SOC_TARGET} - REV=${rev} ${target}" bbnote "building ${IMX_BOOT_SOC_TARGET} - REV=${rev} ${target}"
make SOC=${IMX_BOOT_SOC_TARGET} dtbs=${UBOOT_DTB_NAME} REV=${rev} ${target} > ${S}/mkimage-${rev}-${target}.log 2>&1 make SOC=${IMX_BOOT_SOC_TARGET} REV=${rev} ${target} > ${S}/mkimage-${rev}-${target}.log 2>&1
if [ -e "${BOOT_STAGING}/flash.bin" ]; then if [ -e "${BOOT_STAGING}/flash.bin" ]; then
cp ${BOOT_STAGING}/flash.bin ${S}/${UBOOT_PREFIX}-${MACHINE}-${rev}.bin-${target} cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_NAME}-${MACHINE}-${rev}.bin-${target}
fi fi
SCFWBUILT="yes"
# Remove u-boot-atf-container.img so it gets generated in the next iteration
rm ${BOOT_STAGING}/u-boot-atf-container.img
done done
done done
unset UBOOT_CONFIG_EXTRA
# Check that SCFW was built at least once unset UBOOT_NAME_EXTRA
if [ "${IMX_BOOT_SOC_TARGET}" = "iMX8QX" and "${SCFWBUILT}" != "yes" ]; then
bbfatal "SCFW was not built!"
fi
} }
do_install:ccimx8x () { do_install:ccimx8x () {
@ -66,10 +61,11 @@ do_install:ccimx8x () {
} }
generate_symlinks() { generate_symlinks() {
# imx-boot recipe in meta-freescale assumes only *one* build configuration # imx-boot recipe in meta-freescale supports *multiple* build configurations.
# (otherwise variable BOOT_CONFIG_MACHINE would expand to something incorrect) # We assume here only ONE build configuration for our platforms (otherwise
# UBOOT_CONFIG would be incorrectly expanded)
for target in ${IMXBOOT_TARGETS}; do for target in ${IMXBOOT_TARGETS}; do
mv ${DEPLOYDIR}/${BOOT_CONFIG_MACHINE}-${target} ${DEPLOYDIR}/${BOOT_NAME}-${MACHINE}.bin-${target} mv ${DEPLOYDIR}/${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG}.bin-${target} ${DEPLOYDIR}/${BOOT_NAME}-${MACHINE}.bin-${target}
done done
ln -sf ${BOOT_NAME}-${MACHINE}.bin-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME}-${MACHINE}.bin ln -sf ${BOOT_NAME}-${MACHINE}.bin-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME}-${MACHINE}.bin
ln -sf ${BOOT_NAME}-${MACHINE}.bin-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME} ln -sf ${BOOT_NAME}-${MACHINE}.bin-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME}