summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-12-27 20:45:04 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2015-12-27 20:45:04 +0100
commit919c96726b42bb5a80bd6793d2b48e3ce89af426 (patch)
tree510df5cc7a4550befb36c5d1138f9c5dd73a9dff /target
parent88737e0e461e75e2ce81a134d545656eceadf46d (diff)
more xtensa improvements
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in.kernelfmt4
-rw-r--r--target/config/Config.in.xtensa12
-rw-r--r--target/xtensa/Makefile2
-rw-r--r--target/xtensa/systems/qemu-xtensa1
4 files changed, 13 insertions, 6 deletions
diff --git a/target/config/Config.in.kernelfmt b/target/config/Config.in.kernelfmt
index 71988d8a1..2b878d383 100644
--- a/target/config/Config.in.kernelfmt
+++ b/target/config/Config.in.kernelfmt
@@ -10,9 +10,6 @@ config ADK_TARGET_KERNEL_ZIMAGE
config ADK_TARGET_KERNEL_LINUXBIN
bool
-config ADK_TARGET_KERNEL_IMAGE_ELF
- bool
-
config ADK_TARGET_KERNEL_IMAGE
bool
@@ -30,7 +27,6 @@ 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/config/Config.in.xtensa b/target/config/Config.in.xtensa
index b4908a78a..facf2484b 100644
--- a/target/config/Config.in.xtensa
+++ b/target/config/Config.in.xtensa
@@ -8,6 +8,7 @@ depends on ADK_TARGET_ARCH_XTENSA
config ADK_TARGET_XTENSA_DC233C
bool "dc233c"
select ADK_KERNEL_XTENSA_VARIANT_DC233C
+ select ADK_TARGET_KERNEL_ZIMAGE
select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
select ADK_TARGET_LITTLE_ENDIAN
select ADK_TARGET_WITH_NPTL
@@ -16,13 +17,23 @@ config ADK_TARGET_XTENSA_DC233C
config ADK_TARGET_XTENSA_DC232B
bool "dc232b"
select ADK_KERNEL_XTENSA_VARIANT_DC232B
+ select ADK_TARGET_KERNEL_ZIMAGE
select ADK_TARGET_LITTLE_ENDIAN
select ADK_TARGET_WITH_NPTL
select ADK_TARGET_WITH_MMU
+config ADK_TARGET_XTENSA_FSF
+ bool "fsf"
+ select ADK_KERNEL_XTENSA_VARIANT_FSF
+ select ADK_TARGET_KERNEL_ZIMAGE
+ select ADK_TARGET_BIG_ENDIAN
+ select ADK_TARGET_WITH_NPTL
+ select ADK_TARGET_WITH_MMU
+
config ADK_TARGET_XTENSA_DE212
bool "de212"
select ADK_KERNEL_XTENSA_VARIANT_CUSTOM
+ select ADK_TARGET_KERNEL_ZIMAGE
select ADK_TARGET_LITTLE_ENDIAN
select ADK_TARGET_WITH_LT
select ADK_TARGET_WITHOUT_MMU
@@ -33,4 +44,5 @@ config ADK_TARGET_XTENSA
string
default "dc233c" if ADK_TARGET_XTENSA_DC233C
default "dc232b" if ADK_TARGET_XTENSA_DC232B
+ default "fsf" if ADK_TARGET_XTENSA_FSF
default "de212" if ADK_TARGET_XTENSA_DE212
diff --git a/target/xtensa/Makefile b/target/xtensa/Makefile
index 044a19647..4643854d4 100644
--- a/target/xtensa/Makefile
+++ b/target/xtensa/Makefile
@@ -5,7 +5,7 @@ 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)
+ifeq ($(ADK_TARGET_XTENSA_DE212),y)
KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/Image.elf
else
KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/uImage
diff --git a/target/xtensa/systems/qemu-xtensa b/target/xtensa/systems/qemu-xtensa
index 112afa7a1..1ae3cd111 100644
--- a/target/xtensa/systems/qemu-xtensa
+++ b/target/xtensa/systems/qemu-xtensa
@@ -2,7 +2,6 @@ config ADK_TARGET_SYSTEM_QEMU_XTENSA
bool "Qemu Emulator"
select ADK_CPU_XTENSA
select ADK_TARGET_QEMU
- select ADK_TARGET_KERNEL_ZIMAGE
select ADK_TARGET_KERNEL_WITH_COMPRESSION
select ADK_HOST_BUILD_U_BOOT
help