diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-11-16 20:33:25 +0059 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-11-16 20:36:29 +0059 |
| commit | 83387e792ad5d8beeab48dfa185f4df982a96984 (patch) | |
| tree | ca970d79fa45254444edeb1302eafae51e31fe85 | |
| parent | 349400714ae48f886da6bae729c112d07c8037db (diff) | |
tasks/uboot.mk: Force building with bfd ld
u-boot can't be built with the gold linker, which is the
default linker in ICS.
Make sure u-boot uses BFD ld even if gold is the default.
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | tasks/uboot.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tasks/uboot.mk b/tasks/uboot.mk index ee7ecd6..2be7b20 100644 --- a/tasks/uboot.mk +++ b/tasks/uboot.mk @@ -7,10 +7,14 @@ 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 &&\ - export PATH=$(UBOOT_TCDIR):$(PATH) && \ + 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) && \ $(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) |