summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2011-11-18 18:00:04 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2011-11-18 18:00:04 +0530
commit25cba9c5a672e6c35b0804ef080e3732224ca23f (patch)
treefaa5db54d34512f6e88c8c89a4039399e09972bf
parent4e133a63b0010afff40a274d59ec5f5bda94019c (diff)
Revert "tasks/uboot.mk: Force building with bfd ld"
This reverts commit 9fefeb79936f6af124430fb02039d07883606a9b.
-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)