Sfoglia il codice sorgente

xtensa can be used wth big endian mode

Default for Qemu Targets is little endian.
Fixup qemu example calling parameters.
Waldemar Brodkorb 11 anni fa
parent
commit
41380967e1

+ 9 - 2
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

+ 2 - 5
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

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

+ 2 - 2
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
 

+ 2 - 2
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

+ 2 - 1
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