diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-02-04 17:16:53 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-02-05 10:56:49 +0000 |
| commit | fb42d25daa3fb237fbb106c40a13e2a406d36b83 (patch) | |
| tree | e3210f31d16c79bd718bed841772498f3f3dca07 | |
| parent | ea1bc296b0dbdf71f31aa315ca4bc698d65bada1 (diff) | |
uboot.mk: Unconditionally define UBOOT_{TCDIR,TCPREFIX,SRC}
If these variables are unconditionally defined in one place,
then we don't need to have them cut'n'paste into bootloader.mk
or require TARGET_USE_UBOOT to be defined.
This will let us stop building an unused dummy U-Boot on vexpress.
Change-Id: I7747ecb6eb66d8ad2b2e904b3dc98b52ff5b17e2
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | tasks/bootloader.mk | 8 | ||||
| -rw-r--r-- | tasks/uboot.mk | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/tasks/bootloader.mk b/tasks/bootloader.mk index 3e9d186..12f8032 100644 --- a/tasks/bootloader.mk +++ b/tasks/bootloader.mk @@ -3,14 +3,6 @@ BOOTLOADER_OUT = $(realpath $(PRODUCT_OUT))/boot BOOTLOADER_TARGETS := -# Set source path for u-boot -# 1. use TARGET_UBOOT_SOURCE if defined -# 2. try to use u-boot/<vendor>/<device> if it exists -# 3. try to use u-boot (done in the android_uboot rule) -TARGET_AUTO_UDIR := $(shell echo $(TARGET_DEVICE_DIR) | sed -e 's/^device/u-boot/g') -TARGET_UBOOT_SOURCE ?= $(shell if [ -e $(TARGET_AUTO_UDIR) ]; then echo $(TARGET_AUTO_UDIR); else echo u-boot; fi;) -UBOOT_SRC := $(TARGET_UBOOT_SOURCE) - # Bootloaders have their own separate makefiles and we don't track the # dependencies these, therefore we need to remake them every time in case # files need updating. To facilitate this, bootloader rules will depend on diff --git a/tasks/uboot.mk b/tasks/uboot.mk index 940d70e..6645e76 100644 --- a/tasks/uboot.mk +++ b/tasks/uboot.mk @@ -1,4 +1,3 @@ -ifeq ($(TARGET_USE_UBOOT), true) ifneq ($(UBOOT_TOOLS_PREFIX),) UBOOT_TCDIR = $(realpath $(shell dirname $(UBOOT_TOOLS_PREFIX))) UBOOT_TCPREFIX = $(shell basename $(UBOOT_TOOLS_PREFIX)) @@ -24,6 +23,8 @@ TARGET_AUTO_UDIR := $(shell echo $(TARGET_DEVICE_DIR) | sed -e 's/^device/u-boot TARGET_UBOOT_SOURCE ?= $(shell if [ -e $(TARGET_AUTO_UDIR) ]; then echo $(TARGET_AUTO_UDIR); else echo u-boot; fi;) UBOOT_SRC := $(TARGET_UBOOT_SOURCE) +ifeq ($(TARGET_USE_UBOOT), true) + ifeq ($(USE_PREBUILT_UBOOT),) USE_PREBUILT_UBOOT=false endif |