From 895b529515661f911443b6f5fed1a42aa85ea08a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Fri, 19 Aug 2016 22:47:33 +0200
Subject: solidrun-imx6: fix default fslc kernel build, reported by Joern

---
 target/arm/Makefile              | 3 +++
 target/arm/systems/solidrun-imx6 | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'target/arm')

diff --git a/target/arm/Makefile b/target/arm/Makefile
index ad6e1d9ae..5095d5fae 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -15,6 +15,9 @@ endif
 ifeq ($(ADK_TARGET_KERNEL_XIPIMAGE),y)
 KERNEL:=$(LINUX_DIR)/arch/arm/boot/xipImage
 endif
+ifeq ($(ADK_TARGET_KERNEL_IMAGE),y)
+KERNEL:=$(LINUX_DIR)/arch/arm/boot/Image
+endif
 
 QEMU_ARGS:=${ADK_QEMU_ARGS}
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y)
diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6
index 828348ea2..62dd9c843 100644
--- a/target/arm/systems/solidrun-imx6
+++ b/target/arm/systems/solidrun-imx6
@@ -16,7 +16,6 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_TARGET_WITH_NETDEVICE
 	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	select ADK_TARGET_WITH_ROOT_RW
 	select ADK_PACKAGE_U_BOOT
-- 
cgit v1.2.3