device-tree.bb: Rename EXTRA_OVERLAYS to EXTRA_DT_INCLUDE_FILES

Rename EXTRA_OVERLAYS to EXTRA_DT_INCLUDE_FILES as these variables
add extra files to DT_FILES_PATH and add a #include for each to the
BASE_DTS, it access 1..n dtsi files and adds to SRC_URI.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
index 970fa171..fbe85f96 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -34,12 +34,12 @@ EXTRA_DTFILES_BUNDLE ?= ""
 UBOOT_DT_FILES ?= ""
 UBOOT_DTFILE_PREFIX ?= "system-top"
 UBOOT_DTFILES_BUNDLE ?= ""
-EXTRA_OVERLAYS ?= ""
+EXTRA_DT_INCLUDE_FILES ?= ""
 
 SYSTEM_DTFILE[doc] = "System Device Tree which accepts at 0...1 dts file"
 CONFIG_DTFILE[doc] = "Domain Specific Device Tree which accepts 0...1 dts file"
 EXTRA_DT_FILES[doc] = "Add extra files to DT_FILES_PATH, it accepts 1...n dtsi files and adds to SRC_URI"
-EXTRA_OVERLAYS[doc] = "Add extra files to DT_FILES_PATH and adds a #include for each to the BASE_DTS, it access 1..n dtsi files and adds to SRC_URI"
+EXTRA_DT_INCLUDE_FILES[doc] = "Add extra files to DT_FILES_PATH and adds a #include for each to the BASE_DTS, it access 1..n dtsi files and adds to SRC_URI"
 
 # There should only be ONE CONFIG_DTFILE listed
 # These need to be passed in from global, not from a bbappend
@@ -47,7 +47,7 @@ FILESEXTRAPATHS:prepend := "${@'%s:' % os.path.dirname(d.getVar('CONFIG_DTFILE')
 SRC_URI:append := " ${@'file://%s' % os.path.basename(d.getVar('CONFIG_DTFILE') or '') if (d.getVar('CONFIG_DTFILE')) else ''}"
 
 SRC_URI:append = " ${@" ".join(["file://%s" % f for f in (d.getVar('EXTRA_DT_FILES') or "").split()])}"
-SRC_URI:append = " ${@" ".join(["file://%s" % f for f in (d.getVar('EXTRA_OVERLAYS') or "").split()])}"
+SRC_URI:append = " ${@" ".join(["file://%s" % f for f in (d.getVar('EXTRA_DT_INCLUDE_FILES') or "").split()])}"
 
 COMPATIBLE_MACHINE:zynq   = ".*"
 COMPATIBLE_MACHINE:zynqmp = ".*"
@@ -65,7 +65,7 @@ DTB_FILE_NAME ?= "${BASE_DTS}.dtb"
 
 DTB_BASE_NAME ?= "${MACHINE}-system${IMAGE_VERSION_SUFFIX}"
 
-# Copy the EXTRA_DT_FILES and EXTRA_OVERLAYS files in prepend operation so that
+# Copy the EXTRA_DT_FILES and EXTRA_DT_INCLUDE_FILES files in prepend operation so that
 # it can be preprocessed.
 do_configure:prepend () {
     # Create DT_FILES_PATH directory if doesn't exist during prepend operation.
@@ -73,7 +73,7 @@ do_configure:prepend () {
         mkdir -p ${DT_FILES_PATH}
     fi
 
-    for f in ${EXTRA_DT_FILES} ${EXTRA_OVERLAYS}; do
+    for f in ${EXTRA_DT_FILES} ${EXTRA_DT_INCLUDE_FILES}; do
         if [ "$(realpath ${WORKDIR}/${f})" != "$(realpath ${DT_FILES_PATH}/`basename ${f}`)" ]; then
             cp ${WORKDIR}/${f} ${DT_FILES_PATH}/
         fi
@@ -81,12 +81,12 @@ do_configure:prepend () {
 }
 
 do_configure:append () {
-    for f in ${EXTRA_OVERLAYS}; do
+    for f in ${EXTRA_DT_INCLUDE_FILES}; do
         if [ ! -e ${DT_FILES_PATH}/${BASE_DTS}.dts ]; then
             if [ -e ${DT_FILES_PATH}/${BASE_DTS}.dtb ]; then
-                bberror "Unable to find ${BASE_DTS}.dts, to use EXTRA_OVERLAYS you must use a 'dts' and not 'dtb' in CONFIG_DTFILE"
+                bberror "Unable to find ${BASE_DTS}.dts, to use EXTRA_DT_INCLUDE_FILES you must use a 'dts' and not 'dtb' in CONFIG_DTFILE"
             else
-                bberror "Unable to find ${BASE_DTS}.dts, to use EXTRA_OVERLAYS you must set a valid CONFIG_DTFILE or use system-top.dts"
+                bberror "Unable to find ${BASE_DTS}.dts, to use EXTRA_DT_INCLUDE_FILES you must set a valid CONFIG_DTFILE or use system-top.dts"
             fi
             exit 1
         fi