aboutsummaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2014-12-24 10:54:55 -0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-12-24 15:00:48 +0100
commit49b147ccbb807238009fde815ad68e953077bc3a (patch)
treebc30f253b3b5cb38560f937db085cec870865d3b /linux
parent31347e940198c7c629c184be27e6eb2f7e12ce5d (diff)
downloadbuildroot-49b147ccbb807238009fde815ad68e953077bc3a.tar.gz
buildroot-49b147ccbb807238009fde815ad68e953077bc3a.tar.bz2
Unbreak qemu_xtensa_lx60_defconfig where LINUX_IMAGE_NAME != LINUX_TARGET_NAME. It incorrectly overwrites LINUX_IMAGE_NAME even if it was set before, defeating the purpose of IMAGE being different than TARGET. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'linux')
-rw-r--r--linux/linux.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index 36f0230dde..8256641677 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -82,7 +82,9 @@ KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME))
ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
LINUX_IMAGE_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_NAME))
LINUX_TARGET_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
+ifeq ($(LINUX_IMAGE_NAME),)
LINUX_IMAGE_NAME = $(LINUX_TARGET_NAME)
+endif
else
ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y)
LINUX_IMAGE_NAME = uImage