summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-12-11 11:10:48 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2016-12-26 09:17:48 +0100
commitec043831c0d4b1ceac1990b2318575c4f314b48a (patch)
tree8b12cafd55fd1c60b3860a60bfce9bca7b9134c6 /target
parent2403dd1975733517af51951d20168760ae3d2ba9 (diff)
uCLibc-ng includes libiconv-tiny
Diffstat (limited to 'target')
-rw-r--r--target/arm/uclibc-ng.config1
-rw-r--r--target/config/Config.in.toolchain5
2 files changed, 1 insertions, 5 deletions
diff --git a/target/arm/uclibc-ng.config b/target/arm/uclibc-ng.config
index 490f56a96..ee721c754 100644
--- a/target/arm/uclibc-ng.config
+++ b/target/arm/uclibc-ng.config
@@ -167,6 +167,7 @@ UCLIBC_HAS_CTYPE_SIGNED=y
UCLIBC_HAS_CTYPE_CHECKED=y
# UCLIBC_HAS_CTYPE_ENFORCED is not set
UCLIBC_HAS_WCHAR=y
+UCLIBC_HAS_LIBICONV=y
# UCLIBC_HAS_LOCALE is not set
UCLIBC_HAS_HEXADECIMAL_FLOATS=y
UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index 3cf310e68..92bfd79d5 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -26,11 +26,6 @@ endchoice
choice
depends on ADK_TARGET_OS_LINUX
bool "Iconv implementation"
-default ADK_TARGET_WITHOUT_ICONV if ADK_TARGET_WITHOUT_MMU
-
-config ADK_TARGET_LIBICONV_TINY
- bool "Use tiny libiconv package"
- select ADK_PACKAGE_LIBICONV_TINY
config ADK_TARGET_LIBC_ICONV
bool "Use iconv from C library"