diff options
| author | Zach Pfeffer <zach.pfeffer@linaro.org> | 2011-11-22 21:26:00 +0000 |
|---|---|---|
| committer | Zach Pfeffer <zach.pfeffer@linaro.org> | 2011-11-22 15:36:25 -0600 |
| commit | fea8832c3915ef0dbf2e598b407638d68245e677 (patch) | |
| tree | 31302ea23d9defac166c137dddeced889ddab791 | |
| parent | 7b5d986c44701981fb3bd872d5b2ae4e4b8d7ab0 (diff) | |
tasks: switch to the host toolchain for kernel and u-boot
The kernel and u-boot we're using have issues building under the 4.4.0
toolchain shipped with AOSP. Switch to the built in toolchain while we
investigate a better method of handling this.
Signed-off-by: Zach Pfeffer <zach.pfeffer@linaro.org>
| -rw-r--r-- | tasks/kernel.mk | 13 | ||||
| -rw-r--r-- | tasks/uboot.mk | 8 |
2 files changed, 6 insertions, 15 deletions
diff --git a/tasks/kernel.mk b/tasks/kernel.mk index 9babc67..f2e3d4d 100644 --- a/tasks/kernel.mk +++ b/tasks/kernel.mk @@ -4,18 +4,15 @@ endif android_kernel: $(PRODUCT_OUT)/u-boot.bin cd $(TOP)/kernel &&\ - if [ -e $(TARGET_TOOLS_PREFIX)ld.bfd ]; then LD=$(TARGET_TOOLS_PREFIX)ld.bfd; else LD=$(TARGET_TOOLS_PREFIX)ld; fi && \ - export PATH=../$(BUILD_OUT_EXECUTABLES):$(PATH) && \ - $(MAKE) -j1 $(KERNEL_VERBOSE) ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) LD=$$LD defconfig $(KERNEL_CONFIG) &&\ - $(MAKE) $(KERNEL_VERBOSE) ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) LD=$$LD uImage + $(MAKE) -j1 $(KERNEL_VERBOSE) ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- defconfig $(KERNEL_CONFIG) &&\ + $(MAKE) $(KERNEL_VERBOSE) ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- uImage android_kernel_modules: $(INSTALLED_KERNEL_TARGET) $(ACP) cd $(TOP)/kernel &&\ - export PATH=../$(BUILD_OUT_EXECUTABLES):$(PATH) && \ - $(MAKE) ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) modules + $(MAKE) ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- modules mkdir -p $(TOP)/kernel/modules_for_android cd $(TOP)/kernel &&\ - $(MAKE) ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) modules_install INSTALL_MOD_PATH=modules_for_android + $(MAKE) ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- modules_install INSTALL_MOD_PATH=modules_for_android mkdir -p $(TARGET_OUT)/modules find kernel/modules_for_android -name "*.ko" -exec $(ACP) -fpt {} $(TARGET_OUT)/modules/ \; @@ -24,7 +21,7 @@ ifeq ($(TARGET_USE_GATOR),true) KERNEL_PATH:=$(shell pwd)/kernel gator_driver: android_kernel_modules $(INSTALLED_KERNEL_TARGET) $(ACP) cd $(TOP)/external/gator/driver &&\ - $(MAKE) ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) -C $(KERNEL_PATH) M=`pwd` modules + $(MAKE) ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- -C $(KERNEL_PATH) M=`pwd` modules mkdir -p $(TARGET_OUT)/modules find $(TOP)/external/gator/driver/. -name "*.ko" -exec $(ACP) -fpt {} $(TARGET_OUT)/modules/ \; else diff --git a/tasks/uboot.mk b/tasks/uboot.mk index 8fa5549..a33eb7a 100644 --- a/tasks/uboot.mk +++ b/tasks/uboot.mk @@ -1,11 +1,8 @@ -UBOOT_TCDIR = $(shell dirname $(TARGET_TOOLS_PREFIX)) -UBOOT_TCPREFIX = $(shell basename $(TARGET_TOOLS_PREFIX)) - # u-boot tends to trigger compiler and linker bugs frequently. # If you're running into a problem not fixed easily, use an # older compiler by commenting out the 2 lines above and # uncommenting the one below. -#UBOOT_TCPREFIX = arm-linux-gnueabi- +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 @@ -13,13 +10,10 @@ UBOOT_TCPREFIX = $(shell basename $(TARGET_TOOLS_PREFIX)) 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; 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) cd $(TOP)/u-boot &&\ - export PATH=`pwd`:$(UBOOT_TCDIR):$(PATH) && \ $(MAKE) CROSS_COMPILE=$(UBOOT_TCPREFIX) $(UBOOT_CONFIG) && \ $(MAKE) CROSS_COMPILE=$(UBOOT_TCPREFIX) u-boot.imx endif |