diff options
author | Tejas Bhumkar <tejas.arvind.bhumkar@amd.com> | 2023-07-21 23:20:24 +0530 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2023-07-25 10:51:33 -0500 |
commit | bc6b4622cccbc5c158fdbc83c30da602b4caa458 (patch) | |
tree | 766bcfbcf5391a8f9097b9cd6767292d6655cd29 /meta-xilinx-core/recipes-bsp/u-boot | |
parent | 5c1a8a675c605e4c395933b06edfb435c67208d6 (diff) | |
download | meta-xilinx-bc6b4622cccbc5c158fdbc83c30da602b4caa458.tar.gz |
Add a check for uboot-device-tree dtb
Added below changes:
1)Updated operator in if condition from `==` to `=` as it is used for string comparison in both Bash and Dash, making the script compatible with both shells.
2)Checking for uboot-device-tree.dtb file in RECIPE_SYSROOT path before applying fdtoverlay.
Signed-off-by: Tejas Bhumkar <tejas.arvind.bhumkar@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/recipes-bsp/u-boot')
-rw-r--r-- | meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc | 4 |
1 files changed, 2 insertions, 2 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 baefe293..bbf4125f 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 | |||
@@ -100,7 +100,7 @@ do_blob_generate () { | |||
100 | DTBO=$(echo $CC_DTB | cut -d: -f1) | 100 | DTBO=$(echo $CC_DTB | cut -d: -f1) |
101 | BASE_DTB=$(echo $CC_DTB | cut -d: -f2) | 101 | BASE_DTB=$(echo $CC_DTB | cut -d: -f2) |
102 | OUTPUT_DTB=$(echo $CC_DTB | cut -d: -f3) | 102 | OUTPUT_DTB=$(echo $CC_DTB | cut -d: -f3) |
103 | if [ "${SYSTEM_DTB_BLOB}" == "1" ]; then | 103 | if [ "${SYSTEM_DTB_BLOB}" = "1" ]; then |
104 | BASE_SYS_DTB="${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_FILE_NAME}" | 104 | BASE_SYS_DTB="${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_FILE_NAME}" |
105 | else | 105 | else |
106 | BASE_SYS_DTB="${B}/arch/arm/dts/${BASE_DTB}" | 106 | BASE_SYS_DTB="${B}/arch/arm/dts/${BASE_DTB}" |
@@ -115,8 +115,8 @@ do_blob_generate () { | |||
115 | DTBO=$(echo $CC_DTB | cut -d: -f1) | 115 | DTBO=$(echo $CC_DTB | cut -d: -f1) |
116 | OUTPUT_DTB=$(echo $CC_DTB | cut -d: -f3) | 116 | OUTPUT_DTB=$(echo $CC_DTB | cut -d: -f3) |
117 | BASE_SYS_DTB="${RECIPE_SYSROOT}/${DTB_PATH}/${PACKAGE_UBOOT_DTB_NAME}" | 117 | BASE_SYS_DTB="${RECIPE_SYSROOT}/${DTB_PATH}/${PACKAGE_UBOOT_DTB_NAME}" |
118 | if [ -f ${B}/arch/arm/dts/${DTBO} ] && [ -f ${BASE_SYS_DTB} ]; then | ||
118 | bbnote "fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${BASE_SYS_DTB} ${B}/arch/arm/dts/${DTBO}" | 119 | bbnote "fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${BASE_SYS_DTB} ${B}/arch/arm/dts/${DTBO}" |
119 | if [ -f ${B}/arch/arm/dts/${DTBO} ]; then | ||
120 | fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${BASE_SYS_DTB} ${B}/arch/arm/dts/${DTBO} | 120 | fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${BASE_SYS_DTB} ${B}/arch/arm/dts/${DTBO} |
121 | fi | 121 | fi |
122 | done | 122 | done |