aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2018-11-04 20:58:15 -0800
committerManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2019-01-01 20:03:46 -0800
commitf20fc414f30803c126bea4222d9fb2bb73c2b07f (patch)
treeefc539d39cf1450aa28ae261010dc5cb57f40744
parentc2823e683db1207e6bff7055c77d215301b4c163 (diff)
downloadmeta-xilinx-f20fc414f30803c126bea4222d9fb2bb73c2b07f.tar.gz
meta-xilinx-f20fc414f30803c126bea4222d9fb2bb73c2b07f.tar.bz2
meta-xilinx-f20fc414f30803c126bea4222d9fb2bb73c2b07f.zip
machine-xilinx-default.inc: Add dtb files for IMAGE_BOOT_FILES
Add all available dtb sources to the IMAGE_BOOT_FILES variable. For device-tree recipe generated dtbs the files available are only known after they files are deployed, so a wildcard pattern is used for these files. Note that this pattern appears before the kernel device trees due to the preference to use custom non-kernel device trees where available. This ordering is needed so that recipes like u-boot-zynq-uenv can pick the first device tree to select as the default. The kernel device trees are specifically selected based on the value of KERNEL_DEVICETREE, this avoid the duplication of kernel image type prefixed files along side having the actual files that the kernel builds. Additionally remove all instances of "${MACHINE}.dtb" as they no longer need to be specified and are incorrect due to the nesting of the files in the `devicetree` directory. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r--meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc10
-rw-r--r--meta-xilinx-bsp/conf/machine/microzed-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/picozed-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/qemu-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf1
-rw-r--r--meta-xilinx-contrib/conf/machine/minized-zynq7.conf1
6 files changed, 8 insertions, 7 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 e4c99b8..153a47f 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
@@ -57,12 +57,18 @@ def get_default_image_boot_files(d):
if d.getVar("UBOOT_BINARY"):
files.append(d.getVar("UBOOT_BINARY"))
+ # device trees (device-tree only), these are first as they are likely desired over the kernel ones
+ if "device-tree" in (d.getVar("MACHINE_ESSENTIAL_EXTRA_RDEPENDS") or ""):
+ files.append("devicetree/*.dtb")
+
+
# device trees (kernel only)
if d.getVar("KERNEL_DEVICETREE"):
dtbs = d.getVar("KERNEL_DEVICETREE").split(" ")
dtbs = [os.path.basename(d) for d in dtbs]
- if len(dtbs) != 0:
- files += [d.getVar("KERNEL_IMAGETYPE") + "-" + dtb for dtb in dtbs]
+ for dtb in dtbs:
+ files.append(dtb)
+
return " ".join(files)
XSERVER_EXT ?= ""
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
index 188c5c5..f5fee8c 100644
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
@@ -27,7 +27,6 @@ KERNEL_DEVICETREE = "zynq-microzed.dtb"
IMAGE_BOOT_FILES += " \
boot.bin \
- zynq-microzed.dtb \
uEnv.txt \
"
diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
index a9067b9..28570af 100644
--- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
@@ -31,7 +31,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
IMAGE_BOOT_FILES += " \
boot.bin \
- devicetree/${MACHINE}.dtb \
uEnv.txt \
"
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
index 65bd46a..9725104 100644
--- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
@@ -14,7 +14,6 @@ MACHINE_FEATURES = "ext2 vfat"
SERIAL_CONSOLE = "115200 ttyPS0"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
-IMAGE_BOOT_FILES += "devicetree/${MACHINE}.dtb"
# Use the networking setup from qemuarm
FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
diff --git a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
index 6cc8951..aec8bf6 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
@@ -32,7 +32,6 @@ EXTRA_IMAGEDEPENDS += " \
IMAGE_BOOT_FILES += " \
boot.bin \
- devicetree/${MACHINE}.dtb \
bitstream \
uEnv.txt \
"
diff --git a/meta-xilinx-contrib/conf/machine/minized-zynq7.conf b/meta-xilinx-contrib/conf/machine/minized-zynq7.conf
index 5bacdd5..ec706b6 100644
--- a/meta-xilinx-contrib/conf/machine/minized-zynq7.conf
+++ b/meta-xilinx-contrib/conf/machine/minized-zynq7.conf
@@ -24,6 +24,5 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430"
IMAGE_BOOT_FILES += " \
- devicetree/${MACHINE}.dtb \
uEnv.txt \
"