summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-03-07 15:45:20 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2015-03-07 15:46:14 -0600
commit41380967e1b97e2402b9ccc3f280f17377dc7e2c (patch)
treed8b47229b7508347a32ee8dd7d6880e4031988af /target
parentfd5e1bfc81aa5ea3e3893fc61f8c50509a3487c7 (diff)
xtensa can be used wth big endian mode
Default for Qemu Targets is little endian. Fixup qemu example calling parameters.
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in.endian.choice11
-rw-r--r--target/config/Config.in.xtensa.choice7
-rw-r--r--target/config/Config.in.xtensa.default4
-rw-r--r--target/xtensa/Makefile4
-rw-r--r--target/xtensa/uclibc-ng.config4
-rw-r--r--target/xtensa/uclibc.config3
6 files changed, 21 insertions, 12 deletions
diff --git a/target/config/Config.in.endian.choice b/target/config/Config.in.endian.choice
index 33eb0cc83..1b97743db 100644
--- a/target/config/Config.in.endian.choice
+++ b/target/config/Config.in.endian.choice
@@ -3,8 +3,14 @@
choice ADK_TARGET_ENDIAN_MODE
prompt "Endianess"
-depends on ADK_TARGET_ARCH_SH || ADK_TARGET_ARCH_MIPS || ADK_TARGET_ARCH_MICROBLAZE \
- || ADK_TARGET_ARCH_MIPS64 || ADK_TARGET_ARCH_ARC || ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_C6X
+depends on ADK_TARGET_ARCH_ARC \
+ || ADK_TARGET_ARCH_ARM \
+ || ADK_TARGET_ARCH_C6X \
+ || ADK_TARGET_ARCH_MICROBLAZE \
+ || ADK_TARGET_ARCH_MIPS \
+ || ADK_TARGET_ARCH_MIPS64 \
+ || ADK_TARGET_ARCH_SH \
+ || ADK_TARGET_ARCH_XTENSA
config ADK_TARGET_LITTLE_ENDIAN
bool "Little endian"
@@ -19,5 +25,6 @@ config ADK_TARGET_BIG_ENDIAN
depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
depends on !ADK_TARGET_SYSTEM_QEMU_ARM
+ depends on !ADK_TARGET_SYSTEM_QEMU_XTENSA
endchoice
diff --git a/target/config/Config.in.xtensa.choice b/target/config/Config.in.xtensa.choice
index bd707cd4b..f5c78f90f 100644
--- a/target/config/Config.in.xtensa.choice
+++ b/target/config/Config.in.xtensa.choice
@@ -9,14 +9,11 @@ config ADK_TARGET_XTENSA_DC233C
bool "dc233c"
select ADK_KERNEL_XTENSA_VARIANT_DC233C
select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
+ select ADK_TARGET_LITTLE_ENDIAN
config ADK_TARGET_XTENSA_DC232B
bool "dc232b"
select ADK_KERNEL_XTENSA_VARIANT_DC232B
+ select ADK_TARGET_LITTLE_ENDIAN
endchoice
-
-config ADK_TARGET_XTENSA
- string
- default "dc233c" if ADK_TARGET_XTENSA_DC233C
- default "dc232b" if ADK_TARGET_XTENSA_DC232B
diff --git a/target/config/Config.in.xtensa.default b/target/config/Config.in.xtensa.default
index 43df6220c..56c39c009 100644
--- a/target/config/Config.in.xtensa.default
+++ b/target/config/Config.in.xtensa.default
@@ -1,3 +1,7 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
+config ADK_TARGET_XTENSA
+ string
+ default "dc233c" if ADK_TARGET_XTENSA_DC233C
+ default "dc232b" if ADK_TARGET_XTENSA_DC232B
diff --git a/target/xtensa/Makefile b/target/xtensa/Makefile
index 3760ebff4..19f0a28f0 100644
--- a/target/xtensa/Makefile
+++ b/target/xtensa/Makefile
@@ -11,10 +11,10 @@ KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/uImage
QEMU_ARGS:=-M lx60 -monitor null
QEMU_ARGS+=${ADK_QEMU_ARGS}
-ifeq ($(ADK_TARGET_QEMU_XTENSA_DC233C),y)
+ifeq ($(ADK_KERNEL_XTENSA_VARIANT_DC233C),y)
QEMU_ARGS+=-cpu dc233c
endif
-ifeq ($(ADK_TARGET_QEMU_XTENSA_DC232B),y)
+ifeq ($(ADK_KERNEL_XTENSA_VARIANT_DC232B),y)
QEMU_ARGS+=-cpu dc232b
endif
diff --git a/target/xtensa/uclibc-ng.config b/target/xtensa/uclibc-ng.config
index 4495e5c9b..dbf9e2915 100644
--- a/target/xtensa/uclibc-ng.config
+++ b/target/xtensa/uclibc-ng.config
@@ -79,9 +79,9 @@ UCLIBC_HAS_TLS=y
PTHREADS_DEBUG_SUPPORT=y
UCLIBC_HAS_SYSLOG=y
UCLIBC_HAS_LFS=y
-# MALLOC is not set
+MALLOC=y
# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
+# MALLOC_STANDARD is not set
MALLOC_GLIBC_COMPAT=y
UCLIBC_HAS_OBSTACK=y
UCLIBC_DYNAMIC_ATEXIT=y
diff --git a/target/xtensa/uclibc.config b/target/xtensa/uclibc.config
index f948f03c8..77c2bbfc5 100644
--- a/target/xtensa/uclibc.config
+++ b/target/xtensa/uclibc.config
@@ -76,8 +76,9 @@ UCLIBC_CTOR_DTOR=y
# HAS_NO_THREADS is not set
# LINUXTHREADS_OLD is not set
# LINUXTHREADS_NEW is not set
-UCLIBC_HAS_THREADS_NATIVE=yes
+UCLIBC_HAS_THREADS_NATIVE=y
UCLIBC_HAS_THREADS=y
+UCLIBC_HAS_TLS=y
PTHREADS_DEBUG_SUPPORT=y
UCLIBC_HAS_SYSLOG=y
UCLIBC_HAS_LFS=y