diff options
| author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-03-11 13:19:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-03-11 13:19:51 +0100 |
| commit | 3c236d9262c7b225ca5e832706808e76b7190d8f (patch) | |
| tree | 805bc2e558d46483fa1903f560fe33c19dfb34fd /target | |
| parent | 9689b3e8d0efe90bd3eab5b85634b965e32625c9 (diff) | |
| parent | 4a18b68760a9f4942234dd323e7919cf715f7ef7 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/c6x/uclibc.config | 18 | ||||
| -rw-r--r-- | target/config/Config.in.kernelversion.choice | 1 |
2 files changed, 13 insertions, 6 deletions
diff --git a/target/c6x/uclibc.config b/target/c6x/uclibc.config index 0532ccfae..0a1dda052 100644 --- a/target/c6x/uclibc.config +++ b/target/c6x/uclibc.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc 1.0.0-git C Library Configuration +# uClibc 1.0.1 C Library Configuration # # TARGET_arc is not set # TARGET_arm is not set @@ -10,7 +10,9 @@ TARGET_c6x=y # TARGET_cris is not set # TARGET_i386 is not set # TARGET_m68k is not set +# TARGET_microblaze is not set # TARGET_mips is not set +# TARGET_nios2 is not set # TARGET_powerpc is not set # TARGET_sh is not set # TARGET_sparc is not set @@ -63,14 +65,17 @@ LDSO_BASE_FILENAME="ld.so" # LDSO_PRELINK_SUPPORT is not set # UCLIBC_STATIC_LDCONFIG is not set LDSO_RUNPATH=y +# LDSO_RUNPATH_OF_EXECUTABLE is not set LDSO_SAFE_RUNPATH=y LDSO_SEARCH_INTERP_PATH=y LDSO_LD_LIBRARY_PATH=y -# LDSO_NO_CLEANUP is not set +LDSO_NO_CLEANUP=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set -HAS_NO_THREADS=y -# LINUXTHREADS_OLD is not set +# HAS_NO_THREADS is not set +LINUXTHREADS_OLD=y +UCLIBC_HAS_THREADS=y +# PTHREADS_DEBUG_SUPPORT is not set UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y MALLOC=y @@ -124,8 +129,8 @@ UCLIBC_HAS_EPOLL=y UCLIBC_HAS_XATTR=y # UCLIBC_HAS_PROFILING is not set UCLIBC_HAS_CRYPT_IMPL=y -# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set -# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set +UCLIBC_HAS_SHA256_CRYPT_IMPL=y +UCLIBC_HAS_SHA512_CRYPT_IMPL=y UCLIBC_HAS_CRYPT=y UCLIBC_HAS_NETWORK_SUPPORT=y UCLIBC_HAS_SOCKET=y @@ -221,6 +226,7 @@ UCLIBC_BUILD_NOEXECSTACK=y CROSS_COMPILER_PREFIX="" UCLIBC_EXTRA_CFLAGS="" # DODEBUG is not set +# DODEBUG_PT is not set # DOSTRIP is not set # DOASSERTS is not set # SUPPORT_LD_DEBUG is not set diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice index 893ea6eea..1245cd567 100644 --- a/target/config/Config.in.kernelversion.choice +++ b/target/config/Config.in.kernelversion.choice @@ -11,6 +11,7 @@ config ADK_KERNEL_VERSION_3_19_1 select ADK_KERNEL_VERSION_3_19 depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2 + depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 config ADK_KERNEL_VERSION_3_18_9 bool "3.18.9" |