summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-07-01 12:53:29 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2015-07-01 12:54:22 -0500
commit360767f2ef426c9249131831286df32bd4bb666d (patch)
treec31c38c9cd1061330e5ac35728ac52196390cce0 /target
parent47cad0a0e2381678971c827e495fd46ba0037bf2 (diff)
first step to rework iconv setup
Add a choice to select libiconv, C library iconv or libiconv-tiny.
Diffstat (limited to 'target')
-rw-r--r--target/appliances/kodi.appliance5
-rw-r--r--target/config/Config.in.toolchain18
2 files changed, 21 insertions, 2 deletions
diff --git a/target/appliances/kodi.appliance b/target/appliances/kodi.appliance
index 51be88bd2..dea5f5c48 100644
--- a/target/appliances/kodi.appliance
+++ b/target/appliances/kodi.appliance
@@ -1,10 +1,11 @@
config ADK_APPLIANCE_KODI
bool "kodi multimedia appliance"
- select ADK_KERNEL_VERSION_3_14_43 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
- select ADK_KERNEL_VERSION_3_18_14 if ADK_TARGET_BOARD_BCM28XX
+ select ADK_KERNEL_VERSION_3_14_45 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+ select ADK_KERNEL_VERSION_3_18_16 if ADK_TARGET_BOARD_BCM28XX
select ADK_TARGET_LIB_GLIBC if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
select ADK_PACKAGE_GLIBC if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
select ADK_PACKAGE_GLIBC_GCONV if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+ select ADK_TARGET_LIBICONV if ADK_TARGET_LIB_UCLIBC_NG
select ADK_PACKAGE_KODI
select ADK_PACKAGE_DROPBEAR
select ADK_PACKAGE_DROPBEAR_WITH_UTMP
diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index 2197a89e5..45a7e5e1e 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -1,6 +1,24 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
+choice
+prompt "Iconv implementation"
+bool
+
+config ADK_TARGET_LIBC_ICONV
+ prompt "Use iconv from C library"
+
+config ADK_TARGET_LIBICONV
+ prompt "Use libiconv package"
+ select ADK_PACKAGE_LIBICONV
+
+config ADK_TARGET_LIBICONV_TINY
+ prompt "Use tiny libionv package"
+ select ADK_PACKAGE_LIBICONV_TINY
+
+endchoice
+
+
config ADK_TARGET_CFLAGS_OPT
string
default "-Os -pipe" if ADK_TARGET_CFLAGS_OPT_OS