summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-08-19 22:47:33 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-08-19 22:47:33 +0200
commit895b529515661f911443b6f5fed1a42aa85ea08a (patch)
treeb5f195d18186aa508eac506d7f99182cff6b0121 /target
parent07492630c8578fbb0e346cbbf4e70e4a6d231bb5 (diff)
solidrun-imx6: fix default fslc kernel build, reported by Joern
Diffstat (limited to 'target')
-rw-r--r--target/arm/Makefile3
-rw-r--r--target/arm/systems/solidrun-imx61
-rw-r--r--target/config/Config.in.kernelversion2
3 files changed, 5 insertions, 1 deletions
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
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index 9f5afaebd..624d7afda 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -14,6 +14,8 @@ config ADK_TARGET_KERNEL_VERSION_GIT
config ADK_TARGET_KERNEL_VERSION_FSLC
bool "linux-fslc"
+ select ADK_HOST_NEED_LZOP
+ select ADK_TARGET_KERNEL_IMAGE
depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
config ADK_TARGET_KERNEL_VERSION_RPI