summaryrefslogtreecommitdiff
path: root/target/xtensa
diff options
context:
space:
mode:
Diffstat (limited to 'target/xtensa')
-rw-r--r--target/xtensa/Makefile4
-rw-r--r--target/xtensa/uclibc-ng.config4
-rw-r--r--target/xtensa/uclibc.config3
3 files changed, 6 insertions, 5 deletions
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