diff options
author | John Toomey <john.toomey@amd.com> | 2023-01-23 16:03:30 +0000 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2023-04-10 09:03:22 -0700 |
commit | aa3f1190850d011ecfb198f6536dc97104af5f0c (patch) | |
tree | e29a25958779a8760815f5f2c3a85ba419c279d0 | |
parent | 66c3bde1cb36337fd5848106fdab0c6eb7a068d6 (diff) | |
download | meta-xilinx-aa3f1190850d011ecfb198f6536dc97104af5f0c.tar.gz |
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 <john.toomey@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-rw-r--r-- | meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc | 8 |
1 files 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 () { | |||
96 | install -d ${DT_BLOB_DIR} | 96 | install -d ${DT_BLOB_DIR} |
97 | for CC_DTB in ${IMPORT_CC_DTBS}; do | 97 | for CC_DTB in ${IMPORT_CC_DTBS}; do |
98 | DTBO=$(echo $CC_DTB | cut -d: -f1) | 98 | DTBO=$(echo $CC_DTB | cut -d: -f1) |
99 | DTB=$(echo $CC_DTB | cut -d: -f2) | 99 | BASE_DTB=$(echo $CC_DTB | cut -d: -f2) |
100 | bbnote "fdtoverlay -o ${DT_BLOB_DIR}/${DTB} -i ${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_NAME} ${B}/arch/arm/dts/${DTBO}" | 100 | OUTPUT_DTB=$(echo $CC_DTB | cut -d: -f3) |
101 | bbnote "fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${B}/arch/arm/dts/${BASE_DTB} ${B}/arch/arm/dts/${DTBO}" | ||
101 | if [ -f ${B}/arch/arm/dts/${DTBO} ]; then | 102 | if [ -f ${B}/arch/arm/dts/${DTBO} ]; then |
102 | fdtoverlay -o ${DT_BLOB_DIR}/${DTB} \ | 103 | fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${B}/arch/arm/dts/${BASE_DTB} ${B}/arch/arm/dts/${DTBO} |
103 | -i ${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_NAME} ${B}/arch/arm/dts/${DTBO} | ||
104 | fi | 104 | fi |
105 | done | 105 | done |
106 | 106 | ||