diff options
| author | Zach Pfeffer <zach.pfeffer@linaro.org> | 2011-08-30 15:03:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@betelgeuse.canonical.com> | 2011-08-30 15:03:55 +0000 |
| commit | 1290f42c8c8ba3fa329e8fab1f3c321368d098cf (patch) | |
| tree | 9549856030ec388b251b0adc2ff8ed65ee22a1bf | |
| parent | 3219f8aff287b2d278c016beb0633894515dfb38 (diff) | |
Revert "Use the same toolchain we're using for the rest of the build"
This reverts commit 3219f8aff287b2d278c016beb0633894515dfb38
| -rw-r--r-- | tasks/uboot.mk | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/tasks/uboot.mk b/tasks/uboot.mk index eb6ae31..6138689 100644 --- a/tasks/uboot.mk +++ b/tasks/uboot.mk @@ -1,17 +1,23 @@ -UBOOT_TCDIR := $(shell dirname $(TARGET_TOOLS_PREFIX)) -UBOOT_TCPREFIX := $(shell basename $(TARGET_TOOLS_PREFIX)) +TCPREFIX = arm-linux-gnueabi- +# The 2 lines below (instead of the one above) are actually the right +# thing to do -- grabbing the toolchain we're meant to use. +# Unfortunately the current (4.6-2011.07-0-8-2011-07-25_12-42-06-linux-x86) +# ld fails to link u-boot, so we revert to the old behavior (since it +# picks up an older, working ld on the build machines) for now. +#TCDIR = $(shell dirname $(TARGET_TOOLS_PREFIX)) +#TCPREFIX = $(shell basename $(TARGET_TOOLS_PREFIX)) android_uboot: mkdir -p $(PRODUCT_OUT)/obj/u-boot cd $(TOP)/u-boot &&\ - 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) + export PATH=$(TCDIR):$(PATH) && \ + make O=../$(PRODUCT_OUT)/obj/u-boot CROSS_COMPILE=$(TCPREFIX) $(UBOOT_CONFIG) &&\ + make O=../$(PRODUCT_OUT)/obj/u-boot CROSS_COMPILE=$(TCPREFIX) ifeq ($(TARGET_PRODUCT), iMX53) cd $(TOP)/u-boot &&\ - export PATH=$(UBOOT_TCDIR):$(PATH) && \ - make CROSS_COMPILE=$(UBOOT_TCPREFIX) $(UBOOT_CONFIG) && \ - make CROSS_COMPILE=$(UBOOT_TCPREFIX) u-boot.imx + export PATH=$(TCDIR):$(PATH) && \ + make CROSS_COMPILE=$(TCPREFIX) $(UBOOT_CONFIG) && \ + make CROSS_COMPILE=$(TCPREFIX) u-boot.imx endif $(PRODUCT_OUT)/u-boot.bin: android_uboot |