u-boot-xlnx: Rename DTB_NAME to DTB_FILE_NAME

Match the variable naming used in device-tree recipe, functionality
remains the same.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

2 files changed, 7 insertions, 7 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 535641eb..3f32aa7e 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
@@ -101,7 +101,7 @@ do_blob_generate () {
         BASE_DTB=$(echo $CC_DTB | cut -d: -f2)
         OUTPUT_DTB=$(echo $CC_DTB | cut -d: -f3)
         if [ "${SYSTEM_DTB_BLOB}" == "1" ]; then
-                BASE_SYS_DTB="${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_NAME}"
+                BASE_SYS_DTB="${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_FILE_NAME}"
         else
                 BASE_SYS_DTB="${B}/arch/arm/dts/${BASE_DTB}"
         fi
@@ -125,13 +125,13 @@ do_blob_generate () {
         its_filename="dtblob.its"
         dtblob_emit_its_section "${its_filename}" "header"
         dtblob_emit_its_section "${its_filename}" "imagestart"
-        for dtb in ${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_NAME} $(find ${DT_BLOB_DIR} -name '*.dtb' | sort); do
+        for dtb in ${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_FILE_NAME} $(find ${DT_BLOB_DIR} -name '*.dtb' | sort); do
                 dtblob_emit_dtb "${its_filename}" "$(basename $dtb .dtb)" "$dtb"
         done
         dtblob_emit_its_section "${its_filename}" "sectend"
         dtblob_emit_its_section "${its_filename}" "confstart"
         dtbcount=1
-        for dtb in ${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_NAME} $(find ${DT_BLOB_DIR} -name '*.dtb' | sort); do
+        for dtb in ${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_FILE_NAME} $(find ${DT_BLOB_DIR} -name '*.dtb' | sort); do
                 dtblob_emit_config "${its_filename}" "$(basename $dtb .dtb)" "$(basename $dtb .dtb)" "$dtbcount"
                 dtbcount=`expr $dtbcount + 1`
         done
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
index 10dfbb60..4c7ea934 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
@@ -9,7 +9,7 @@ SYSROOT_DIRS += "/boot"
 
 BASE_DTS ?= "${@os.path.basename(d.getVar('CONFIG_DTFILE') or '').rstrip('.dtb').rstrip('.dts') or 'system-top'}"
 DTB_PATH ?= "boot/devicetree/"
-DTB_NAME ?= ""
+DTB_FILE_NAME ?= ""
 
 # This vairable is used for U-boot user specified dts from u-boot repo path
 # u-boot-xlnx/arch/arm/dts/versal-vck190-revA-x-ebm-01-revA.dts.
@@ -17,7 +17,7 @@ DTB_NAME ?= ""
 # Example: UBOOT_USER_SPECIFIED_DTS = "versal-vck190-revA-x-ebm-01-revA"
 UBOOT_USER_SPECIFIED_DTS ?= ""
 
-EXTRA_OEMAKE += "${@'EXT_DTB=${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_NAME}' if (d.getVar('DTB_NAME') != '' and d.getVar('UBOOT_USER_SPECIFIED_DTS') == '') else '' }"
+EXTRA_OEMAKE += "${@'EXT_DTB=${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_FILE_NAME}' if (d.getVar('DTB_FILE_NAME') != '' and d.getVar('UBOOT_USER_SPECIFIED_DTS') == '') else '' }"
 EXTRA_OEMAKE += "${@'DEVICE_TREE=${UBOOT_USER_SPECIFIED_DTS}' if (d.getVar('UBOOT_USER_SPECIFIED_DTS') != '') else '' }"
 
 python __anonymous () {
@@ -25,8 +25,8 @@ python __anonymous () {
     providerdtb = d.getVar("PREFERRED_PROVIDER_virtual/dtb")
     if providerdtb:
        d.appendVarFlag('do_configure', 'depends', ' virtual/dtb:do_populate_sysroot')
-       if d.getVar("DTB_NAME") is not None:
-           d.setVar('DTB_NAME', d.getVar('BASE_DTS')+ '.dtb')
+       if d.getVar("DTB_FILE_NAME") is not None:
+           d.setVar('DTB_FILE_NAME', d.getVar('BASE_DTS')+ '.dtb')
 }
 
 do_configure:prepend () {