From aa3f1190850d011ecfb198f6536dc97104af5f0c Mon Sep 17 00:00:00 2001 From: John Toomey Date: Mon, 23 Jan 2023 16:03:30 +0000 Subject: Modify FIT blob generation to use correct SOM DTB The DTBs contained in the FIT image should be generated using the SOM specific DTB rather than the system-top.dtb allowing for a single image to boot on both SOM variants. Signed-off-by: John Toomey Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc index 5f09a99f..4d9a45c0 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc @@ -96,11 +96,11 @@ do_blob_generate () { install -d ${DT_BLOB_DIR} for CC_DTB in ${IMPORT_CC_DTBS}; do DTBO=$(echo $CC_DTB | cut -d: -f1) - DTB=$(echo $CC_DTB | cut -d: -f2) - bbnote "fdtoverlay -o ${DT_BLOB_DIR}/${DTB} -i ${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_NAME} ${B}/arch/arm/dts/${DTBO}" + BASE_DTB=$(echo $CC_DTB | cut -d: -f2) + OUTPUT_DTB=$(echo $CC_DTB | cut -d: -f3) + bbnote "fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${B}/arch/arm/dts/${BASE_DTB} ${B}/arch/arm/dts/${DTBO}" if [ -f ${B}/arch/arm/dts/${DTBO} ]; then - fdtoverlay -o ${DT_BLOB_DIR}/${DTB} \ - -i ${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_NAME} ${B}/arch/arm/dts/${DTBO} + fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${B}/arch/arm/dts/${BASE_DTB} ${B}/arch/arm/dts/${DTBO} fi done -- cgit v1.2.3-54-g00ecf