diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-02-04 18:15:47 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-02-05 10:52:09 +0000 |
| commit | ea1bc296b0dbdf71f31aa315ca4bc698d65bada1 (patch) | |
| tree | 408ace529ef1933d887a73124f0bd1bbea2d12af | |
| parent | 9445dde85cfb134ae15a1daff37e785b0514aa5e (diff) | |
kernel.mk: Only build uImage when using U-Boot
Change the default KERNEL_TARGET to zImage and only use uImage when
U-Boot is specified as the bootloader. Additionally, only set the
KERNEL_TARGET if it is not already specified, this will let devices
override the default.
These changes will help support moving to building zImages rather than
uImages which are more friendly for most bootloaders. Note, U-Boot can
also support zImage and will likely need to do so soon as uImage is
broken on multiplatform kernels due to the load address in the header
never being set.
Change-Id: I58eadf2c84452d5f968fd68e548c49c3dacea21a
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | tasks/kernel.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tasks/kernel.mk b/tasks/kernel.mk index c89cc92..43a7081 100644 --- a/tasks/kernel.mk +++ b/tasks/kernel.mk @@ -35,12 +35,12 @@ endif ifeq ($(strip $(ANDROID_64)),true) KERNEL_TARGET := Image else -ifeq ($(strip $(TARGET_BOOTLOADER_TYPE)),fastboot) -BOOTLOADER_DEP := -KERNEL_TARGET := zImage -else +ifeq ($(strip $(TARGET_BOOTLOADER_TYPE)),uboot) BOOTLOADER_DEP := $(PRODUCT_OUT)/u-boot.bin -KERNEL_TARGET := uImage +KERNEL_TARGET := $(or $(KERNEL_TARGET),uImage) +else +BOOTLOADER_DEP := +KERNEL_TARGET := $(or $(KERNEL_TARGET),zImage) endif endif |