diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-03-20 13:14:29 +0100 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-03-20 13:14:29 +0100 |
| commit | 3644b52f69aa57ced1238b9a694c99b6fbedf390 (patch) | |
| tree | 902d32702669d6aa13036a1481025bbd86c85aa0 | |
| parent | ac0d15c0111de13155fda340baca7609983e3ffa (diff) | |
bootloader.mk: Remove workaround for AOSP 4.4 toolchain
Remove the workaround for AOSP's 4.4 toolchain being unable to build
bootwrapper.
In JellyBean, AOSP is on 4.6, which is sufficient -- and as of 2013.03,
Linaro toolchains live in prebuilts/ as well...
Change-Id: I8664e21de3ec08057701def4fd74122661e8c3d7
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | tasks/bootloader.mk | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tasks/bootloader.mk b/tasks/bootloader.mk index d7e1b80..587763c 100644 --- a/tasks/bootloader.mk +++ b/tasks/bootloader.mk @@ -181,18 +181,11 @@ ifneq ($(BOOTWRAPPER_TOOLS_PREFIX),) BOOTWRAPPER_TCDIR = $(realpath $(shell dirname $(BOOTWRAPPER_TOOLS_PREFIX))) BOOTWRAPPER_TCPREFIX = $(shell basename $(BOOTWRAPPER_TOOLS_PREFIX)) else -ifneq ($(findstring prebuilt,$(TARGET_TOOLS_PREFIX)),) -# The AOSP prebuilt toolchain is too old to compile -# the boot-wrapper, so we fall back to a system compiler -BOOTWRAPPER_TCDIR = $(shell basename `which arm-linux-gnueabi-gcc`) -BOOTWRAPPER_TCPREFIX = arm-linux-gnueabi- -else BOOTWRAPPER_TCDIR = $(realpath $(shell dirname $(TARGET_TOOLS_PREFIX))) # The boot-wrapper is not an Android application and should be # built with the bare metal toolchain if it is available BOOTWRAPPER_TCPREFIX = $(shell if [ -e $(BOOTWRAPPER_TCDIR)/arm-eabi-gcc ]; then echo arm-eabi-; else basename $(TARGET_TOOLS_PREFIX); fi) endif -endif # # Invoke make with the toolchain setup for cross compilation, example usage: |