diff options
Diffstat (limited to 'target/xtensa')
| -rw-r--r-- | target/xtensa/Makefile | 16 | ||||
| -rw-r--r-- | target/xtensa/kernel/qemu-xtensa | 4 | ||||
| -rw-r--r-- | target/xtensa/overlay/xtensa_dc233c_call0.tar | bin | 0 -> 942080 bytes | |||
| -rw-r--r-- | target/xtensa/overlay/xtensa_dc233c_windowed.tar (renamed from target/xtensa/overlay/xtensa_dc233c.tar) | bin | 808960 -> 808960 bytes | |||
| -rw-r--r-- | target/xtensa/uclibc-ng-nommu.config | 38 |
5 files changed, 41 insertions, 17 deletions
diff --git a/target/xtensa/Makefile b/target/xtensa/Makefile index 457783bfc..99031d0ae 100644 --- a/target/xtensa/Makefile +++ b/target/xtensa/Makefile @@ -5,24 +5,24 @@ include $(ADK_TOPDIR)/rules.mk include $(ADK_TOPDIR)/mk/kernel-build.mk include $(ADK_TOPDIR)/mk/image.mk -ifeq ($(ADK_TARGET_CPU_XTENSA_DE212),y) -KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/Image.elf -else -KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/uImage -endif - QEMU_ARGS:=${ADK_QEMU_ARGS} ifeq ($(ADK_TARGET_CPU_XTENSA_DC233C),y) -QEMU_ARGS+=-M kc705 -QEMU_ARGS+=-cpu dc233c +QEMU_ARGS+=-M lx60 +QEMU_ARGS+=-cpu dc233c -m 128 +KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/Image.elf endif ifeq ($(ADK_TARGET_CPU_XTENSA_DC232B),y) QEMU_ARGS+=-M kc705 QEMU_ARGS+=-cpu dc232b +KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/uImage endif ifeq ($(ADK_TARGET_CPU_XTENSA_DE212),y) QEMU_ARGS+=-M kc705-nommu QEMU_ARGS+=-cpu de212 -m 256 +KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/Image.elf +endif +ifeq ($(ADK_TARGET_CPU_XTENSA_KC705_BE),y) +KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/uImage endif # target helper text diff --git a/target/xtensa/kernel/qemu-xtensa b/target/xtensa/kernel/qemu-xtensa index f56550baa..16ab302b4 100644 --- a/target/xtensa/kernel/qemu-xtensa +++ b/target/xtensa/kernel/qemu-xtensa @@ -1,5 +1,5 @@ CONFIG_XTENSA=y +CONFIG_XTENSA_UNALIGNED_USER=y CONFIG_XTENSA_PLATFORM_XTFPGA=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS0,38400 memmap=128M@0" -CONFIG_COMPAT_32BIT_TIME=y +CONFIG_SECTION_MISMATCH_WARN_ONLY=y diff --git a/target/xtensa/overlay/xtensa_dc233c_call0.tar b/target/xtensa/overlay/xtensa_dc233c_call0.tar Binary files differnew file mode 100644 index 000000000..c36f65cc4 --- /dev/null +++ b/target/xtensa/overlay/xtensa_dc233c_call0.tar diff --git a/target/xtensa/overlay/xtensa_dc233c.tar b/target/xtensa/overlay/xtensa_dc233c_windowed.tar Binary files differindex 56ccc5b31..56ccc5b31 100644 --- a/target/xtensa/overlay/xtensa_dc233c.tar +++ b/target/xtensa/overlay/xtensa_dc233c_windowed.tar diff --git a/target/xtensa/uclibc-ng-nommu.config b/target/xtensa/uclibc-ng-nommu.config index e9f9a7546..b2a2ae778 100644 --- a/target/xtensa/uclibc-ng-nommu.config +++ b/target/xtensa/uclibc-ng-nommu.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.45 C Library Configuration +# uClibc-ng 1.0.48 C Library Configuration # # TARGET_aarch64 is not set # TARGET_alpha is not set @@ -43,9 +43,9 @@ TARGET_ARCH_BITS=32 TARGET_ARCH="xtensa" FORCE_OPTIONS_FOR_ARCH=y TARGET_SUBARCH="" -UCLIBC_FORMAT_FLAT=y +UCLIBC_FORMAT_FDPIC_ELF=y +# UCLIBC_FORMAT_FLAT is not set # UCLIBC_FORMAT_FLAT_SEP_DATA is not set -# UCLIBC_FORMAT_SHARED_FLAT is not set ARCH_HAS_DEPRECATED_SYSCALLS=y ARCH_ANY_ENDIAN=y ARCH_LITTLE_ENDIAN=y @@ -66,13 +66,31 @@ HAVE_DOT_CONFIG=y # General Library Settings # DOPIC=y -# STATIC_PIE is not set -ARCH_HAS_NO_SHARED=y -ARCH_HAS_NO_LDSO=y ARCH_HAS_UCONTEXT=y +HAVE_LDSO=y +HAVE_SHARED=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +LDSO_PRELOAD_ENV_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +# LDSO_STANDALONE_SUPPORT is not set +# LDSO_PRELINK_SUPPORT is not set +UCLIBC_STATIC_LDCONFIG=y +LDSO_RUNPATH=y +# LDSO_RUNPATH_OF_EXECUTABLE is not set +LDSO_SAFE_RUNPATH=y +LDSO_SEARCH_INTERP_PATH=y +LDSO_LD_LIBRARY_PATH=y UCLIBC_CTOR_DTOR=y -HAS_NO_THREADS=y +# LDSO_GNU_HASH_SUPPORT is not set +# HAS_NO_THREADS is not set # UCLIBC_HAS_LINUXTHREADS is not set +UCLIBC_HAS_THREADS_NATIVE=y +UCLIBC_HAS_THREADS=y +UCLIBC_HAS_TLS=y +# PTHREADS_DEBUG_SUPPORT is not set PTHREADS_STACK_DEFAULT_SIZE=2097152 UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y @@ -151,6 +169,7 @@ UCLIBC_DNSRAND_MODE_PRNGPLUS=y # UCLIBC_HAS_STRING_GENERIC_OPT=y UCLIBC_HAS_STRING_ARCH_OPT=y +UCLIBC_HAS_STDIO_FUTEXES=y UCLIBC_HAS_CTYPE_TABLES=y UCLIBC_HAS_CTYPE_SIGNED=y # UCLIBC_HAS_CTYPE_UNSAFE is not set @@ -214,6 +233,8 @@ HARDWIRED_ABSPATH=y # Security options # # UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +# UCLIBC_BUILD_NOW is not set UCLIBC_BUILD_NOEXECSTACK=y # @@ -224,6 +245,9 @@ UCLIBC_EXTRA_CFLAGS="" # DODEBUG is not set # DOSTRIP is not set # DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set # UCLIBC_MALLOC_DEBUGGING is not set +# UCLIBC_HAS_BACKTRACE is not set WARNINGS="-Wall" # EXTRA_WARNINGS is not set |