From 02a68744c96ceb5350d0eb3b2f5834be545cc63c Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 21 Jan 2022 12:58:07 -0800 Subject: machine-xilinx-default.inc: Fix bootbin and UBOOT SUFFIX type The default for virtual/boot-bin should be xilinx-bootbin. The default UBOOT_SUFFIX should be 'bin'. Otherwise u-boot-xlnx may fail being able to not find u-boot.img. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc index dd02ab1f..a15e92c6 100644 --- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc @@ -12,12 +12,11 @@ PREFERRED_PROVIDER_virtual/kernel ??= "linux-xlnx" # U-Boot Configuration PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-xlnx" -PREFERRED_PROVIDER_virtual/boot-bin ??= "${PREFERRED_PROVIDER_virtual/bootloader}" +PREFERRED_PROVIDER_virtual/boot-bin ??= "xilinx-bootbin" do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}" -UBOOT_SUFFIX ?= "img" -UBOOT_SUFFIX:microblaze ?= "bin" +UBOOT_SUFFIX ?= "bin" UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" UBOOT_ELF ?= "u-boot" -- cgit v1.2.3-54-g00ecf