[meta-ti] [PATCH] u-boot_2011.09: Always use gnu ld for LD

[Khem Raj]

u-boot wants GNU ld and cant link with gold
so when default linker is gold we make sure
that it still uses good old GNU ld

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 recipes-bsp/u-boot/u-boot/always-use-bfd-ld.patch |   29 +++++++++++++++++++++
 recipes-bsp/u-boot/u-boot_2011.09.bb              |    3 +-
 2 files changed, 31 insertions(+), 1 deletions(-)
 create mode 100644 recipes-bsp/u-boot/u-boot/always-use-bfd-ld.patch

diff --git a/recipes-bsp/u-boot/u-boot/always-use-bfd-ld.patch b/recipes-bsp/u-boot/u-boot/always-use-bfd-ld.patch
new file mode 100644
index 0000000..a527317
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot/always-use-bfd-ld.patch
@@ -0,0 +1,29 @@
+This patch makes sure that we always use the GNU ld. u-boot uses certain contruct
+e.g. OVERLAY which are not implemented in gold therefore it always needs GNU ld
+for linking. It works well if default linker in toolchain is GNU ld but in some cases
+we can have gold to be the default linker and also ship GNU ld but not as default
+in such cases its called $(PREFIX)ld.bfd, with this patch we make sure that if
+$(PREFIX)ld.bfd exists than we use that for our ld. This way it does not matter
+what the default ld is.
+
+Upstream-status: Pending
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+
+--- a/config.mk
++++ b/config.mk
+@@ -126,11 +126,13 @@ cc-option = $(strip $(if $(findstring $1
+ 		$(if $(call cc-option-sys,$1),$1,$2)))
+ endif
+ 
++exists_bfd_ld = $(shell if $(CROSS_COMPILE)ld.bfd -v >& /dev/null; \
++		then echo "$(1)"; else echo "$(2)"; fi; )
+ #
+ # Include the make variables (CC, etc...)
+ #
+ AS	= $(CROSS_COMPILE)as
+-LD	= $(CROSS_COMPILE)ld
++LD	= $(call exists_bfd_ld, "$(CROSS_COMPILE)ld.bfd", "$(CROSS_COMPILE)ld")
+ CC	= $(CROSS_COMPILE)gcc
+ CPP	= $(CC) -E
+ AR	= $(CROSS_COMPILE)ar
diff --git a/recipes-bsp/u-boot/u-boot_2011.09.bb b/recipes-bsp/u-boot/u-boot_2011.09.bb
index 74c8518..7924fe3 100644
--- a/recipes-bsp/u-boot/u-boot_2011.09.bb
+++ b/recipes-bsp/u-boot/u-boot_2011.09.bb
@@ -1,6 +1,6 @@
 require u-boot.inc
 
-PR = "r5"
+PR = "r6"
 
 # SPL build
 UBOOT_BINARY = "u-boot.img"
@@ -32,6 +32,7 @@ SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git \
            file://2011.09/0019-BeagleBoard-config-Really-switch-to-ttyO2.patch \
            file://2011.09/0020-beagleboard-add-support-for-TCT-Beacon-board.patch \
            file://2011.09/0021-beagleboard-add-support-for-scanning-loop-through-ex.patch \
+           file://always-use-bfd-ld.patch \
            file://fw_env.config \
           "
 
-- 
1.7.5.4