From d36ee7a87c0d89b2820eea4bfcdae342adc75019 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 29 Aug 2024 21:43:24 -0300 Subject: [PATCH] u-boot: Ensure we use BFD as linker even if using GCC for it If we are using 'ld-is-gold' as DISTRO_FEATURE, the U-Boot Makefile has mechanisms to ensure that we use BFD as linker. However, this does not work for the GCC when it is used as linking tool. To support that, we added explicit BFD use whenever we have the DISTRO_FEATURE feature enabled. Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 5a7bd6703fe..ed3822784ef 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -9,7 +9,8 @@ inherit uboot-config uboot-extlinux-config uboot-sign deploy python3native kerne DEPENDS += "swig-native" -EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${DEBUG_PREFIX_MAP}" V=1' +EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} V=1' +EXTRA_OEMAKE += 'CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)} ${DEBUG_PREFIX_MAP}"' EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' EXTRA_OEMAKE += 'STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}' -- 2.47.2