diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-02-05 10:47:42 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-02-06 16:39:39 +0000 |
| commit | 03b5c0224a0c9c0d381555b519e432f4f855ceb2 (patch) | |
| tree | d99e22074fadb7c9eeed9c27afe481f0aa7a3565 | |
| parent | e76bd65059e3b0122a44fce0e30bec87874c807f (diff) | |
| download | build-linaro_android_4.2.1.tar.gz | |
build: Allow kernel and initrd names to be overriddenlinaro_android_4.2.1
Devices may want or need to give their own names for these.
Change-Id: I8366c213333b8c969d06b276547c6e86fc6ebed9
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | target/board/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index aa463cd7c0..5a9ab1539f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -359,7 +359,7 @@ INTERNAL_RAMDISK_FILES := $(filter $(TARGET_ROOT_OUT)/%, \ ifeq ($(TARGET_BOOTLOADER_TYPE),uboot) BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/uInitrd else -BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img +BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/$(or $(INSTALLED_RAMDISK_TARGET_NAME),ramdisk.img) endif # We just build this directly to the install location. diff --git a/target/board/Android.mk b/target/board/Android.mk index 0ea276ad09..c4656f263a 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -18,7 +18,7 @@ ifneq ($(strip $(TARGET_NO_KERNEL)),true) ifeq ($(TARGET_BOOTLOADER_TYPE),uboot) INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/uImage else - INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel + INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/$(or $(INSTALLED_KERNEL_TARGET_NAME),kernel) endif else INSTALLED_KERNEL_TARGET := |