Hey,
here's a patch, which allows to change the KERNEL_DEVICETREE in a machine
overlay without modifying the IMAGE_BOOT_FILES.
Franz
From 25a170c8b3e07308fb1d9c27e7403486b37c72fb Mon Sep 17 00:00:00 2001
From: Calculus <not_a.per...@rosenberger.com>
Date: Wed, 6 Dec 2017 15:54:07 +0100
Subject: [PATCH] Append *-KERNEL_DEVICETREE variable to IMAGE_BOOT_FILES
instead of hardcoded .dtb name
---
conf/machine/zc702-zynq7.conf | 2 +-
conf/machine/zc706-zynq7.conf | 2 +-
conf/machine/zcu102-zynqmp.conf | 2 +-
conf/machine/zedboard-zynq7.conf | 2 +-
conf/machine/zybo-zynq7.conf | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf
index 57877bf..395166d 100644
--- a/conf/machine/zc702-zynq7.conf
+++ b/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 ${KERNEL_IMAGETYPE}-${KERNEL_DEVICETREE}"
# Although not fully supported you can run this machine on the mainline QEMU 'xilinx-zynq-a9' machine
IMAGE_CLASSES += "qemuboot"
diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf
index d2fbf1b..d3d14a6 100644
--- a/conf/machine/zc706-zynq7.conf
+++ b/conf/machine/zc706-zynq7.conf
@@ -31,7 +31,7 @@ KERNEL_DEVICETREE = "zynq-zc706.dtb"
IMAGE_BOOT_FILES += " \
boot.bin \
- ${KERNEL_IMAGETYPE}-zynq-zc706.dtb \
+ ${KERNEL_IMAGETYPE}-${KERNEL_DEVICETREE} \
uEnv.txt \
"
diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf
index fe41148..200cdf2 100644
--- a/conf/machine/zcu102-zynqmp.conf
+++ b/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 ${KERNEL_IMAGETYPE}-${@os.path.basename(KERNEL_DEVICETREE)}"
# This machine has a QEMU model, runqemu setup:
IMAGE_CLASSES += "qemuboot-xilinx"
diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf
index 114927d..5f1c389 100644
--- a/conf/machine/zedboard-zynq7.conf
+++ b/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 ${KERNEL_IMAGETYPE}-${KERNEL_DEVICETREE}"
diff --git a/conf/machine/zybo-zynq7.conf b/conf/machine/zybo-zynq7.conf
index e94ad6b..b579dee 100644
--- a/conf/machine/zybo-zynq7.conf
+++ b/conf/machine/zybo-zynq7.conf
@@ -28,7 +28,7 @@ KERNEL_DEVICETREE = "zynq-zybo.dtb"
IMAGE_BOOT_FILES += " \
boot.bin \
- ${KERNEL_IMAGETYPE}-zynq-zybo.dtb \
+ ${KERNEL_IMAGETYPE}-${KERNEL_DEVICETREE} \
uEnv.txt \
"
--
2.7.4
--
_______________________________________________
meta-xilinx mailing list
meta-xilinx@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-xilinx
