Add virtual/boot-bin to EXTRA_IMAGEDEPENDS for all Zynq and ZynqMP targets that use the deployed boot.bin from U-Boot.
Set the default provider for virtual/boot-bin to the current virtual/bootloader provider. This handles the differing u-boot/u-boot-xlnx defaults and also sets up the default provider for consumers of machine-xilinx-default.inc. Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- conf/machine/include/machine-xilinx-default.inc | 1 + conf/machine/microzed-zynq7.conf | 5 ++++- conf/machine/picozed-zynq7.conf | 5 ++++- conf/machine/zc702-zynq7.conf | 5 ++++- conf/machine/zc706-zynq7.conf | 5 ++++- conf/machine/zcu102-zynqmp.conf | 1 + conf/machine/zedboard-zynq7.conf | 5 ++++- conf/machine/zybo-linux-bd-zynq7.conf | 8 +++++--- conf/machine/zybo-zynq7.conf | 5 ++++- 9 files changed, 31 insertions(+), 9 deletions(-) diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index 02238c1147..522e008120 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc @@ -18,6 +18,7 @@ PREFERRED_PROVIDER_virtual/kernel ??= "${XILINX_DEFAULT_KERNEL}" XILINX_DEFAULT_UBOOT := "u-boot-xlnx" XILINX_DEFAULT_UBOOT_zynqmp := "u-boot" PREFERRED_PROVIDER_virtual/bootloader ??= "${XILINX_DEFAULT_UBOOT}" +PREFERRED_PROVIDER_virtual/boot-bin ??= "${PREFERRED_PROVIDER_virtual/bootloader}" UBOOT_SUFFIX ?= "img" UBOOT_SUFFIX_zynqmp ?= "bin" diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf index aaca1ca8d9..815bf4745f 100644 --- a/conf/machine/microzed-zynq7.conf +++ b/conf/machine/microzed-zynq7.conf @@ -13,7 +13,10 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot" UBOOT_MACHINE = "zynq_microzed_config" SPL_BINARY = "spl/boot.bin" -EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv" +EXTRA_IMAGEDEPENDS += " \ + u-boot-zynq-uenv \ + virtual/boot-bin \ + " SERIAL_CONSOLE = "115200 ttyPS0" diff --git a/conf/machine/picozed-zynq7.conf b/conf/machine/picozed-zynq7.conf index 9f8a37e884..59b4a6cb80 100644 --- a/conf/machine/picozed-zynq7.conf +++ b/conf/machine/picozed-zynq7.conf @@ -17,7 +17,10 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot" UBOOT_MACHINE = "zynq_picozed_config" SPL_BINARY = "spl/boot.bin" -EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv" +EXTRA_IMAGEDEPENDS += " \ + u-boot-zynq-uenv \ + virtual/boot-bin \ + " SERIAL_CONSOLE = "115200 ttyPS0" diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf index 1bf373048f..57877bfaef 100644 --- a/conf/machine/zc702-zynq7.conf +++ b/conf/machine/zc702-zynq7.conf @@ -20,7 +20,10 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" UBOOT_MACHINE = "zynq_zc702_config" SPL_BINARY = "spl/boot.bin" -EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv" +EXTRA_IMAGEDEPENDS += " \ + u-boot-zynq-uenv \ + virtual/boot-bin \ + " SERIAL_CONSOLE = "115200 ttyPS0" diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf index 38c3b4b5b1..d2fbf1b1f3 100644 --- a/conf/machine/zc706-zynq7.conf +++ b/conf/machine/zc706-zynq7.conf @@ -20,7 +20,10 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget" UBOOT_MACHINE = "zynq_zc706_config" SPL_BINARY = "spl/boot.bin" -EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv" +EXTRA_IMAGEDEPENDS += " \ + u-boot-zynq-uenv \ + virtual/boot-bin \ + " SERIAL_CONSOLE = "115200 ttyPS0" diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf index 80b6d6f37f..fe411483e1 100644 --- a/conf/machine/zcu102-zynqmp.conf +++ b/conf/machine/zcu102-zynqmp.conf @@ -32,6 +32,7 @@ EXTRA_IMAGEDEPENDS += " \ arm-trusted-firmware \ qemu-devicetrees \ virtual/pmu-firmware \ + virtual/boot-bin \ " IMAGE_BOOT_FILES += "uEnv.txt atf-uboot.ub ${KERNEL_IMAGETYPE}-zynqmp-zcu102-rev1.0.dtb" diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf index 58cee372fd..114927de67 100644 --- a/conf/machine/zedboard-zynq7.conf +++ b/conf/machine/zedboard-zynq7.conf @@ -16,7 +16,10 @@ require conf/machine/include/machine-xilinx-board.inc UBOOT_MACHINE = "zynq_zed_config" SPL_BINARY = "spl/boot.bin" -EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv" +EXTRA_IMAGEDEPENDS += " \ + u-boot-zynq-uenv \ + virtual/boot-bin \ + " SERIAL_CONSOLE = "115200 ttyPS0" diff --git a/conf/machine/zybo-linux-bd-zynq7.conf b/conf/machine/zybo-linux-bd-zynq7.conf index b73d908d50..b916a209f8 100644 --- a/conf/machine/zybo-linux-bd-zynq7.conf +++ b/conf/machine/zybo-linux-bd-zynq7.conf @@ -21,9 +21,11 @@ UBOOT_MACHINE = "zynq_zybo_config" SPL_BINARY = "spl/boot.bin" FORCE_PLATFORM_INIT = "1" -EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv" - -EXTRA_IMAGEDEPENDS += "virtual/bitstream" +EXTRA_IMAGEDEPENDS += " \ + u-boot-zynq-uenv \ + virtual/boot-bin \ + virtual/bitstream \ + " IMAGE_BOOT_FILES += " \ boot.bin \ diff --git a/conf/machine/zybo-zynq7.conf b/conf/machine/zybo-zynq7.conf index a3e9c06b3b..e94ad6b914 100644 --- a/conf/machine/zybo-zynq7.conf +++ b/conf/machine/zybo-zynq7.conf @@ -17,7 +17,10 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot" UBOOT_MACHINE = "zynq_zybo_config" SPL_BINARY = "spl/boot.bin" -EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv" +EXTRA_IMAGEDEPENDS += " \ + u-boot-zynq-uenv \ + virtual/boot-bin \ + " SERIAL_CONSOLE = "115200 ttyPS0" -- 2.15.0 -- _______________________________________________ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx