summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrik Ryd <patrik.ryd@linaro.org>2011-11-18 13:48:11 +0100
committerPatrik Ryd <patrik.ryd@linaro.org>2011-11-18 13:48:11 +0100
commit40b9b35001ba89de305ba57773126c6a4d95d36f (patch)
treec6ca997459af678718a2ae3e3b312c8e50aa9f99
parente72c935c61563fa7f7c602739ead5a12f8341dc6 (diff)
Revert "tasks/uboot.mk: Force building with bfd ld"
This reverts commit 83387e792ad5d8beeab48dfa185f4df982a96984.
-rw-r--r--tasks/uboot.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/tasks/uboot.mk b/tasks/uboot.mk
index 2be7b20..ee7ecd6 100644
--- a/tasks/uboot.mk
+++ b/tasks/uboot.mk
@@ -7,14 +7,10 @@ UBOOT_TCPREFIX = $(shell basename $(TARGET_TOOLS_PREFIX))
# uncommenting the one below.
#UBOOT_TCPREFIX = arm-linux-gnueabi-
-# u-boot can't be built with gold - so we force BFD LD into the
-# PATH ahead of everything else
-
android_uboot: $(ACP)
mkdir -p $(PRODUCT_OUT)/obj/u-boot
cd $(TOP)/u-boot &&\
- if [ -e $(UBOOT_TCDIR)/$(UBOOT_TCPREFIX)ld.bfd ]; then ln -sf $(UBOOT_TCDIR)/$(UBOOT_TCPREFIX)ld.bfd $(UBOOT_TCPREFIX)ld; ln -sf $(UBOOT_TCDIR)/$(UBOOT_TCPREFIX)ld.bfd ld; fi &&\
- export PATH=`pwd`:$(UBOOT_TCDIR):$(PATH) && \
+ export PATH=$(UBOOT_TCDIR):$(PATH) && \
$(MAKE) O=../$(PRODUCT_OUT)/obj/u-boot CROSS_COMPILE=$(UBOOT_TCPREFIX) $(UBOOT_CONFIG) &&\
$(MAKE) O=../$(PRODUCT_OUT)/obj/u-boot CROSS_COMPILE=$(UBOOT_TCPREFIX)
ifeq ($(TARGET_PRODUCT), iMX53)