summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2013-03-20 13:16:04 +0100
committerBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2013-03-20 13:16:04 +0100
commit9a13f16d022acf269d7541b14d8ee4c2c705716d (patch)
treefb41e171754cedf217a6b03b7e81ae100aa62716
parent3644b52f69aa57ced1238b9a694c99b6fbedf390 (diff)
uboot.mk: Remove workaround for AOSP 4.4 toolchain
Remove the workaround for AOSP's 4.4 toolchain being unable to build uboot. In JellyBean, AOSP is on 4.6, which is sufficient -- and as of 2013.03, Linaro toolchains live in prebuilts/ as well... Change-Id: I779f31bf1680e4df0326fc5ee0021e8d376b68db Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--tasks/uboot.mk7
1 files changed, 0 insertions, 7 deletions
diff --git a/tasks/uboot.mk b/tasks/uboot.mk
index 6645e76..ba0d957 100644
--- a/tasks/uboot.mk
+++ b/tasks/uboot.mk
@@ -2,18 +2,11 @@ ifneq ($(UBOOT_TOOLS_PREFIX),)
UBOOT_TCDIR = $(realpath $(shell dirname $(UBOOT_TOOLS_PREFIX)))
UBOOT_TCPREFIX = $(shell basename $(UBOOT_TOOLS_PREFIX))
else
-ifneq ($(findstring prebuilt,$(TARGET_TOOLS_PREFIX)),)
-# The AOSP prebuilt toolchain is too old to compile
-# current u-boot, so we fall back to a system compiler
-UBOOT_TCDIR = $(shell basename `which arm-linux-gnueabi-gcc`)
-UBOOT_TCPREFIX = arm-linux-gnueabi-
-else
UBOOT_TCDIR = $(realpath $(shell dirname $(TARGET_TOOLS_PREFIX)))
# u-boot is not an Android application and should be
# built with the bare metal toolchain if it is available
UBOOT_TCPREFIX = $(shell if [ -e $(UBOOT_TCDIR)/arm-eabi-gcc ]; then echo arm-eabi-; else basename $(TARGET_TOOLS_PREFIX); fi)
endif
-endif
# Set source path for u-boot
# 1. use TARGET_UBOOT_SOURCE if defined