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

ccimx8x: u-boot: deploy all u-boot files to the imx-boot-tools directory 

This way, customers are less likely to flash the plain u-boot by accident
instead of imx-boot. Also, have the imx-boot recipe look for the u-boot files
in the imx-boot-tools directory.

https://jira.digi.com/browse/DEL-6185

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2018-09-25 10:59:57 +02:00
parent 66d51040c5
commit f9427d1641
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
View File

@ -122,7 +122,7 @@ do_compile () {
cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} ${S}/${SOC_TARGET}/scfw_tcm.bin cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} ${S}/${SOC_TARGET}/scfw_tcm.bin
cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${S}/${SOC_TARGET}/bl31.bin cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${S}/${SOC_TARGET}/bl31.bin
for type in ${UBOOT_CONFIG}; do for type in ${UBOOT_CONFIG}; do
cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME}-${type} ${S}/${SOC_TARGET}/u-boot.bin-${type} cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_NAME}-${type} ${S}/${SOC_TARGET}/u-boot.bin-${type}
done done
fi fi
@ -167,10 +167,7 @@ DEPLOYDIR_IMXBOOT = "${BOOT_TOOLS}"
do_deploy () { do_deploy () {
install -d ${DEPLOYDIR}/${DEPLOYDIR_IMXBOOT} install -d ${DEPLOYDIR}/${DEPLOYDIR_IMXBOOT}
# copy the tool mkimage to deploy path and sc fw, dcd and uboot # copy the tool mkimage to deploy path along with sc fw and dcd
for type in ${UBOOT_CONFIG}; do
install -m 0644 ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME}-${type} ${DEPLOYDIR}/${DEPLOYDIR_IMXBOOT}
done
if [ "${SOC_TARGET}" = "iMX8M" ]; then if [ "${SOC_TARGET}" = "iMX8M" ]; then
install -m 0644 ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} ${DEPLOYDIR}/${DEPLOYDIR_IMXBOOT} install -m 0644 ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} ${DEPLOYDIR}/${DEPLOYDIR_IMXBOOT}
for ddr_firmware in ${DDR_FIRMWARE_NAME}; do for ddr_firmware in ${DDR_FIRMWARE_NAME}; do

9
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
View File

@ -169,4 +169,13 @@ do_deploy_append() {
rm -f ${TMP_BOOTSCR} rm -f ${TMP_BOOTSCR}
} }
BOOT_TOOLS = "imx-boot-tools"
do_deploy_append_ccimx8x() {
# Move all U-Boot artifacts to the imx-boot-tools folder
# U-Boot images are not bootable on the i.MX8X
install -d ${DEPLOYDIR}/${BOOT_TOOLS}
mv ${DEPLOYDIR}/u-boot* ${DEPLOYDIR}/${BOOT_TOOLS}/
}
COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)"