diff options
8 files changed, 15 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 0f2ced48..b07362a2 100644 --- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc @@ -42,6 +42,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 9b08d1be..e64f87e7 100644 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf @@ -31,7 +31,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 628d4046..c1f4ffff 100644 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf @@ -34,7 +34,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 f04a42ca..c62d908b 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/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf index dda099d8..3d3cf277 100644 --- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf @@ -32,7 +32,7 @@ EXTRA_IMAGEDEPENDS += " \ arm-trusted-firmware \ virtual/boot-bin \ " -IMAGE_BOOT_FILES += "uEnv.txt atf-uboot.ub ${KERNEL_IMAGETYPE}-zynqmp-zcu104-revC.dtb" +IMAGE_BOOT_FILES += "uEnv.txt atf-uboot.ub ${@get_dtb_list(d)}" MACHINE_HWCODECS = "libomxil-xlnx" diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf index edc95c13..364e551f 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf @@ -31,6 +31,6 @@ EXTRA_IMAGEDEPENDS += " \ virtual/boot-bin \ " -IMAGE_BOOT_FILES += "uEnv.txt atf-uboot.ub ${KERNEL_IMAGETYPE}-zynqmp-zcu106-revA.dtb" +IMAGE_BOOT_FILES += "uEnv.txt atf-uboot.ub ${@get_dtb_list(d)}" MACHINE_HWCODECS = "libomxil-xlnx" diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf index a329074e..42d1eff5 100644 --- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf @@ -28,5 +28,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 5b405637..ada8c0d8 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf @@ -31,7 +31,7 @@ KERNEL_DEVICETREE = "zynq-zybo.dtb" IMAGE_BOOT_FILES += " \ boot.bin \ - ${KERNEL_IMAGETYPE}-zynq-zybo.dtb \ + ${@get_dtb_list(d)} \ uEnv.txt \ " |