diff options
9 files changed, 38 insertions, 12 deletions
diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc index ba9a36be..17041e41 100644 --- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc +++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc @@ -2,5 +2,3 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader" -IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${UBOOT_BINARY}" - 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 b07362a2..e4c99b8f 100644 --- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc @@ -42,13 +42,28 @@ XSERVER ?= " \ ${XSERVER_EXT} \ " -def get_dtb_list(d): +IMAGE_BOOT_FILES ?= "${@get_default_image_boot_files(d)}" + +def get_default_image_boot_files(d): + files = [] + + # kernel images + kerneltypes = set((d.getVar("KERNEL_IMAGETYPE") or "").split()) + kerneltypes |= set((d.getVar("KERNEL_IMAGETYPES") or "").split()) + for i in kerneltypes: + files.append(i) + + # u-boot image + if d.getVar("UBOOT_BINARY"): + files.append(d.getVar("UBOOT_BINARY")) + + # 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: - return " ".join([d.getVar("KERNEL_IMAGETYPE") + "-" + dtb for dtb in dtbs]) - return "" + files += [d.getVar("KERNEL_IMAGETYPE") + "-" + dtb for dtb in dtbs] + return " ".join(files) 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 e64f87e7..32c0d6e7 100644 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf @@ -31,7 +31,10 @@ SERIAL_CONSOLE = "115200 ttyPS0" KERNEL_DEVICETREE = "zynq-zc702.dtb" -IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${@get_dtb_list(d)}" +IMAGE_BOOT_FILES += " \ + boot.bin \ + uEnv.txt \ + " # 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 c1f4ffff..a92c052d 100644 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf @@ -34,7 +34,6 @@ KERNEL_DEVICETREE = "zynq-zc706.dtb" IMAGE_BOOT_FILES += " \ boot.bin \ - ${@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 c62d908b..88be85ec 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -35,7 +35,10 @@ EXTRA_IMAGEDEPENDS += " \ virtual/boot-bin \ " -IMAGE_BOOT_FILES += "uEnv.txt atf-uboot.ub ${@get_dtb_list(d)}" +IMAGE_BOOT_FILES += " \ + uEnv.txt \ + atf-uboot.ub \ + " # 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 3d3cf277..bb8d9929 100644 --- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf @@ -32,7 +32,10 @@ EXTRA_IMAGEDEPENDS += " \ arm-trusted-firmware \ virtual/boot-bin \ " -IMAGE_BOOT_FILES += "uEnv.txt atf-uboot.ub ${@get_dtb_list(d)}" +IMAGE_BOOT_FILES += " \ + uEnv.txt \ + atf-uboot.ub \ + " 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 364e551f..e1e9d47f 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf @@ -31,6 +31,9 @@ EXTRA_IMAGEDEPENDS += " \ virtual/boot-bin \ " -IMAGE_BOOT_FILES += "uEnv.txt atf-uboot.ub ${@get_dtb_list(d)}" +IMAGE_BOOT_FILES += " \ + uEnv.txt \ + atf-uboot.ub \ + " 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 42d1eff5..4f9f03ed 100644 --- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf @@ -28,5 +28,8 @@ SERIAL_CONSOLE = "115200 ttyPS0" KERNEL_DEVICETREE = "zynq-zed.dtb" -IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${@get_dtb_list(d)}" +IMAGE_BOOT_FILES += " \ + boot.bin \ + uEnv.txt \ + " diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf index ada8c0d8..f0b6bce8 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf @@ -31,7 +31,6 @@ KERNEL_DEVICETREE = "zynq-zybo.dtb" IMAGE_BOOT_FILES += " \ boot.bin \ - ${@get_dtb_list(d)} \ uEnv.txt \ " |