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

imx-boot: use new UBOOT_PREFIX variable instead of creating one 

The recipe was creating a variable with the value of another one from
the main recipe, just to refer to the bootable artifact prefix.
We can now use instead the new UBOOT_PREFIX variable.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2019-07-11 11:51:41 +02:00
parent e50f6c3e91
commit 3263fda892
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
View File

@ -33,7 +33,6 @@ do_populate_lic[depends] += " \
ATF_MACHINE_NAME_mx8qxp = "bl31-imx8qx.bin" ATF_MACHINE_NAME_mx8qxp = "bl31-imx8qx.bin"
UBOOT_NAME = "u-boot-${MACHINE}.bin" UBOOT_NAME = "u-boot-${MACHINE}.bin"
BOOT_CONFIG_MACHINE = "${BOOT_NAME}"
IMXBOOT_TARGETS_ccimx8x = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_flexspi', \ IMXBOOT_TARGETS_ccimx8x = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_flexspi', \
'flash flash_regression_linux_m4', d)}" 'flash flash_regression_linux_m4', d)}"
@ -65,7 +64,7 @@ do_compile () {
bbnote "building ${SOC_TARGET} - ${ramc} - ${target}" bbnote "building ${SOC_TARGET} - ${ramc} - ${target}"
make SOC=${SOC_TARGET} ${target} make SOC=${SOC_TARGET} ${target}
if [ -e "${BOOT_STAGING}/flash.bin" ]; then if [ -e "${BOOT_STAGING}/flash.bin" ]; then
cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin-${target} cp ${BOOT_STAGING}/flash.bin ${S}/${UBOOT_PREFIX}-${MACHINE}-${ramc}.bin-${target}
fi fi
SCFWBUILT="yes" SCFWBUILT="yes"
done done
@ -88,7 +87,7 @@ do_install () {
install -d ${D}/boot install -d ${D}/boot
for ramc in ${RAM_CONFIGS}; do for ramc in ${RAM_CONFIGS}; do
for target in ${IMXBOOT_TARGETS}; do for target in ${IMXBOOT_TARGETS}; do
install -m 0644 ${S}/${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin-${target} ${D}/boot/ install -m 0644 ${S}/${UBOOT_PREFIX}-${MACHINE}-${ramc}.bin-${target} ${D}/boot/
done done
done done
} }
@ -114,13 +113,13 @@ do_deploy () {
IMAGE_IMXBOOT_TARGET="$target" IMAGE_IMXBOOT_TARGET="$target"
echo "Set boot target as $IMAGE_IMXBOOT_TARGET" echo "Set boot target as $IMAGE_IMXBOOT_TARGET"
fi fi
install -m 0644 ${S}/${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin-${target} ${DEPLOYDIR} install -m 0644 ${S}/${UBOOT_PREFIX}-${MACHINE}-${ramc}.bin-${target} ${DEPLOYDIR}
done done
cd ${DEPLOYDIR} cd ${DEPLOYDIR}
ln -sf ${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin-${IMAGE_IMXBOOT_TARGET} ${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin ln -sf ${UBOOT_PREFIX}-${MACHINE}-${ramc}.bin-${IMAGE_IMXBOOT_TARGET} ${UBOOT_PREFIX}-${MACHINE}-${ramc}.bin
# Link to default bootable U-Boot filename. It gets overwritten # Link to default bootable U-Boot filename. It gets overwritten
# on every loop so the only last RAM_CONFIG will survive. # on every loop so the only last RAM_CONFIG will survive.
ln -sf ${BOOT_CONFIG_MACHINE}-${MACHINE}-${ramc}.bin-${IMAGE_IMXBOOT_TARGET} ${BOOTABLE_FILENAME} ln -sf ${UBOOT_PREFIX}-${MACHINE}-${ramc}.bin-${IMAGE_IMXBOOT_TARGET} ${BOOTABLE_FILENAME}
cd - cd -
done done
} }