Przeglądaj źródła

use Image.elf for Xtensa-nommu as suggested by Max

Waldemar Brodkorb 8 lat temu
rodzic
commit
88737e0e46
2 zmienionych plików z 8 dodań i 0 usunięć
  1. 4 0
      target/config/Config.in.kernelfmt
  2. 4 0
      target/xtensa/Makefile

+ 4 - 0
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

+ 4 - 0
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}