diff options
| -rw-r--r-- | tasks/uboot.mk | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/tasks/uboot.mk b/tasks/uboot.mk index 4f06aab..36d5091 100644 --- a/tasks/uboot.mk +++ b/tasks/uboot.mk @@ -1,13 +1,15 @@ ifneq ($(UBOOT_TOOLS_PREFIX),) -UBOOT_TCDIR = $(realpath $(shell dirname $(UBOOT_TOOLS_PREFIX))) -UBOOT_TCPREFIX = $(shell basename $(UBOOT_TOOLS_PREFIX)) +UBOOT_TCDIR := $(shell dirname $(UBOOT_TOOLS_PREFIX)) +UBOOT_TCPREFIX := $(shell basename $(UBOOT_TOOLS_PREFIX)) else -UBOOT_TCDIR = $(realpath $(shell dirname $(TARGET_TOOLS_PREFIX))) +UBOOT_TCDIR := $(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) +UBOOT_TCPREFIX := $(shell if [ -e $(UBOOT_TCDIR)/arm-eabi-gcc ]; then echo arm-eabi-; else basename $(TARGET_TOOLS_PREFIX); fi) endif +UBOOT_TCDIR := $(realpath $(UBOOT_TCDIR)) + # Set source path for u-boot # 1. use TARGET_UBOOT_SOURCE if defined # 2. try to use u-boot/<vendor>/<device> if it exists @@ -37,8 +39,9 @@ endif cd $(UBOOT_SRC) &&\ 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=$(UBOOT_FOREST_ROOT)/$(PRODUCT_OUT)/obj/u-boot CROSS_COMPILE=$(UBOOT_TCPREFIX) $(UBOOT_CONFIG) &&\ - $(MAKE) O=$(UBOOT_FOREST_ROOT)/$(PRODUCT_OUT)/obj/u-boot CROSS_COMPILE=$(UBOOT_TCPREFIX) + $(MAKE) -j1 O=$(UBOOT_FOREST_ROOT)/$(PRODUCT_OUT)/obj/u-boot CROSS_COMPILE=$(UBOOT_TCPREFIX) $(UBOOT_CONFIG) &&\ + $(MAKE) O=$(UBOOT_FOREST_ROOT)/$(PRODUCT_OUT)/obj/u-boot CROSS_COMPILE=$(UBOOT_TCPREFIX) && \ + rm -f $(UBOOT_TCPREFIX)ld ifeq ($(TARGET_PRODUCT), iMX53) cd $(UBOOT_SRC) &&\ export PATH=`pwd`:$(UBOOT_TCDIR):$(PATH) && \ @@ -94,8 +97,9 @@ endif endif -ifeq ($(TARGET_PRODUCT),full_jacinto6evm) -ifeq ($(USE_PREBUILT_UBOOT), true) +ifneq (,$(filter $(TARGET_PRODUCT),full_jacinto6evm full_am57xevm)) +ifeq ($(USE_PREBUeLT_UBOOT), true) +UBOOT_FILES := $(PRODUCT_OUT)/u-boot.bin $(PRODUCT_OUT)/u-boot.img $(PRODUCT_OUT)/MLO $(PRODUCT_OUT)/u-boot.bin: ln -sf ../../../../device/linaro/jacinto6evm/u-boot.bin $(PRODUCT_OUT)/u-boot.bin $(PRODUCT_OUT)/u-boot.img: @@ -104,6 +108,8 @@ $(PRODUCT_OUT)/u-boot.img: $(PRODUCT_OUT)/MLO: ln -sf ../../../../device/linaro/jacinto6evm/MLO $(PRODUCT_OUT)/MLO else + +UBOOT_FILES := $(PRODUCT_OUT)/u-boot.img $(PRODUCT_OUT)/MLO $(PRODUCT_OUT)/u-boot.img: android_uboot ln -sf obj/u-boot/u-boot.img $(PRODUCT_OUT)/u-boot.img @@ -115,6 +121,7 @@ endif ifeq ($(TARGET_PRODUCT), full_panda) ifeq ($(USE_PREBUILT_UBOOT), true) +UBOOT_FILES := $(PRODUCT_OUT)/u-boot.bin $(PRODUCT_OUT)/u-boot.img $(PRODUCT_OUT)/MLO $(PRODUCT_OUT)/u-boot.bin: ln -sf ../../../../device/ti/panda/u-boot.bin $(PRODUCT_OUT)/u-boot.bin $(PRODUCT_OUT)/u-boot.img: @@ -123,6 +130,8 @@ $(PRODUCT_OUT)/u-boot.img: $(PRODUCT_OUT)/MLO: ln -sf ../../../../device/ti/panda/MLO $(PRODUCT_OUT)/MLO else +UBOOT_FILES := $(PRODUCT_OUT)/u-boot.img $(PRODUCT_OUT)/MLO + $(PRODUCT_OUT)/u-boot.img: android_uboot ln -sf obj/u-boot/u-boot.img $(PRODUCT_OUT)/u-boot.img @@ -130,6 +139,10 @@ $(PRODUCT_OUT)/MLO: android_uboot ln -sf obj/u-boot/MLO $(PRODUCT_OUT)/MLO endif endif + + +droidcore: $(UBOOT_FILES) + else $(PRODUCT_OUT)/u-boot.bin: endif |