summaryrefslogtreecommitdiff
path: root/target/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-09-09 18:44:49 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-09-09 18:44:49 +0200
commit3b9f9fc8e3468e0930fe1ab952cbae3894c256f0 (patch)
treead2a16638951c59702e3a2278f6da97bc3bfb282 /target/config
parent3ac37c8cfdbf621f223cbce7115ceb3306ad6f6a (diff)
parent86a2eb56549502f21ff753f6bce0ea32bb7a2cb7 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config')
-rw-r--r--target/config/Config.in.libc.choice5
-rw-r--r--target/config/Config.in.libc.default2
2 files changed, 6 insertions, 1 deletions
diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice
index 609ab5cdb..31a626664 100644
--- a/target/config/Config.in.libc.choice
+++ b/target/config/Config.in.libc.choice
@@ -72,6 +72,11 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT
select ADK_DISABLE_CHECKSUM
depends on ADK_TARGET_LIB_UCLIBC_NG
+config ADK_TARGET_LIB_GLIBC_2_20
+ prompt "2.20"
+ boolean
+ depends on ADK_TARGET_LIB_GLIBC
+
config ADK_TARGET_LIB_GLIBC_2_19
prompt "2.19"
boolean
diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default
index f0daedd2d..04c6b4204 100644
--- a/target/config/Config.in.libc.default
+++ b/target/config/Config.in.libc.default
@@ -24,7 +24,7 @@ config ADK_LIBC_VERSION
string
default "1.1.4" if ADK_TARGET_LIB_MUSL_1_1_4
default "0.9.33.2" if ADK_TARGET_LIB_UCLIBC_0_9_33_2
- default "2.19" if ADK_TARGET_LIB_GLIBC_2_19
+ default "2.20" if ADK_TARGET_LIB_GLIBC_2_20
default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
ADK_TARGET_LIB_UCLIBC_GIT || \
ADK_TARGET_LIB_MUSL_GIT || \