[meta-xilinx] [PATCH 1/7] get_dtb_list function which formats the dtb files properly before adding to IMAGE_BOOT_FILES

[Nathan Rossi]

From: Franz Forstmayr <f.forstmayr at gmail.com>

Replaced the hard-coded devicetree files in IMAGE_BOOT_FILES with a function,
which formats the KERNEL_DEVICETREE list properly.

v2: Removed the additional "True" statement from d.getvar.

Signed-off-by: Franz Forstmayr <f.forstmayr at gmail.com>
Reviewed-by: Nathan Rossi <nathan at nathanrossi.com>
Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
 meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc | 8 ++++++++
 meta-xilinx-bsp/conf/machine/zc702-zynq7.conf                   | 2 +-
 meta-xilinx-bsp/conf/machine/zc706-zynq7.conf                   | 2 +-
 meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf                 | 2 +-
 meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf                | 2 +-
 meta-xilinx-bsp/conf/machine/zybo-zynq7.conf                    | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
index 77fbec884a..6a9d1b71f1 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
@@ -34,6 +34,14 @@ XSERVER ?= " \
 	${XSERVER_EXT} \
 	"
 
+def get_dtb_list(d):
+    if d.getVar("KERNEL_DEVICETREE"):
+        dtbs = d.getVar("KERNEL_DEVICETREE").split(" ")
+        dtbs = [os.path.basename(d) for d in dtbs]
+        if len(dtbs) != 0:
+            return " ".join([d.getVar("KERNEL_IMAGETYPE") + "-" + dtb for dtb in dtbs])
+    return ""
+
 XSERVER_EXT ?= ""
 XSERVER_EXT_zynqmp ?= "xf86-video-armsoc"
 
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index 57877bfaef..07eb3d3ab7 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -29,7 +29,7 @@ SERIAL_CONSOLE = "115200 ttyPS0"
 
 KERNEL_DEVICETREE = "zynq-zc702.dtb"
 
-IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${KERNEL_IMAGETYPE}-zynq-zc702.dtb"
+IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${@get_dtb_list(d)}"
 
 # Although not fully supported you can run this machine on the mainline QEMU 'xilinx-zynq-a9' machine
 IMAGE_CLASSES += "qemuboot"
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index d2fbf1b1f3..d106a9dc5f 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -31,7 +31,7 @@ KERNEL_DEVICETREE = "zynq-zc706.dtb"
 
 IMAGE_BOOT_FILES += " \
 		boot.bin \
-		${KERNEL_IMAGETYPE}-zynq-zc706.dtb \
+		${@get_dtb_list(d)} \
 		uEnv.txt \
 		"
 
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index fe411483e1..d08348dc5b 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -35,7 +35,7 @@ EXTRA_IMAGEDEPENDS += " \
 		virtual/boot-bin \
 		"
 
-IMAGE_BOOT_FILES += "uEnv.txt atf-uboot.ub ${KERNEL_IMAGETYPE}-zynqmp-zcu102-rev1.0.dtb"
+IMAGE_BOOT_FILES += "uEnv.txt atf-uboot.ub ${@get_dtb_list(d)}"
 
 # This machine has a QEMU model, runqemu setup:
 IMAGE_CLASSES += "qemuboot-xilinx"
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
index 114927de67..fb09063ee7 100644
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
@@ -25,5 +25,5 @@ SERIAL_CONSOLE = "115200 ttyPS0"
 
 KERNEL_DEVICETREE = "zynq-zed.dtb"
 
-IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${KERNEL_IMAGETYPE}-zynq-zed.dtb"
+IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${@get_dtb_list(d)}"
 
diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
index e94ad6b914..796c98f750 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
@@ -28,7 +28,7 @@ KERNEL_DEVICETREE = "zynq-zybo.dtb"
 
 IMAGE_BOOT_FILES += " \
 		boot.bin \
-		${KERNEL_IMAGETYPE}-zynq-zybo.dtb \
+		${@get_dtb_list(d)} \
 		uEnv.txt \
 		"
 
-- 
2.15.1