From a5efdc57797ead8bc9d9ae58b6d30d67b834a810 Mon Sep 17 00:00:00 2001 From: Varalaxmi Bingi Date: Thu, 14 Mar 2024 23:26:41 +0530 Subject: machine-xilinx-default.inc: use u-boot.elf for MB and Zynq For microblaze u-boot not booting on qemu or hw after moving to u-boot 2024.1 rebase branch. Reason explained below: u-boot will provide output files as u-boot.elf, u-boot, u-boot.bin, u-boot-nodtb.bin etc.. For Microblaze and Zynq we are using u-boot output file For aarch64 family we are using u-boot.elf u-boot: which has no relocation inside, then we apply relocation (rela section) over binary. and then copying as u-boot.elf and using it. u-boot.elf: It will relocation inside it and without debug symbols. After recent relocation changes in u-boot we should use u-boot.elf only for all platforms. Signed-off-by: Varalaxmi Bingi Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta-xilinx-core/conf') 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 e99b1f0e..c732523c 100644 --- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc @@ -28,8 +28,7 @@ do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC UBOOT_SUFFIX ?= "bin" UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" -UBOOT_ELF ?= "u-boot" -UBOOT_ELF:aarch64 ?= "u-boot.elf" +UBOOT_ELF ?= "u-boot.elf" # libmali is selected by DISTRO_FEATURE of libmali & MACHINE_FEATURES of mali400 # lima is selected by DISTRO_FEATURE != libmali & MACHINE_FEATURES of mali400 -- cgit v1.2.3-54-g00ecf