diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-12-27 17:38:47 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-12-27 17:38:55 +0100 |
| commit | 88737e0e461e75e2ce81a134d545656eceadf46d (patch) | |
| tree | 17adc2dab83fa717006d7438c8f42e5949a4a38d /target | |
| parent | 01e0761fc16f3f3de993ec7ab4fd952c7fa2f6f3 (diff) | |
use Image.elf for Xtensa-nommu as suggested by Max
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.kernelfmt | 4 | ||||
| -rw-r--r-- | target/xtensa/Makefile | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/target/config/Config.in.kernelfmt b/target/config/Config.in.kernelfmt index 2b878d383..71988d8a1 100644 --- a/target/config/Config.in.kernelfmt +++ b/target/config/Config.in.kernelfmt @@ -10,6 +10,9 @@ config ADK_TARGET_KERNEL_ZIMAGE config ADK_TARGET_KERNEL_LINUXBIN bool +config ADK_TARGET_KERNEL_IMAGE_ELF + bool + config ADK_TARGET_KERNEL_IMAGE bool @@ -27,6 +30,7 @@ config ADK_TARGET_KERNEL default "uImage" if ADK_TARGET_KERNEL_UIMAGE default "zImage" if ADK_TARGET_KERNEL_ZIMAGE default "Image" if ADK_TARGET_KERNEL_IMAGE + default "Image.elf" if ADK_TARGET_KERNEL_IMAGE_ELF default "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE diff --git a/target/xtensa/Makefile b/target/xtensa/Makefile index a485239b8..044a19647 100644 --- a/target/xtensa/Makefile +++ b/target/xtensa/Makefile @@ -5,7 +5,11 @@ include $(ADK_TOPDIR)/rules.mk include $(ADK_TOPDIR)/mk/kernel-build.mk include $(ADK_TOPDIR)/mk/image.mk +ifeq ($(ADK_TARGET_KERNEL_IMAGE_ELF),y) +KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/Image.elf +else KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/uImage +endif QEMU_ARGS:=-M ml605 -monitor null QEMU_ARGS+=${ADK_QEMU_ARGS} |