Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 10 insertions, 8 deletions

diff --git a/target/appliances/kodi.appliance b/target/appliances/kodi.appliance
index 68232afa4..4982a6f77 100644
--- a/target/appliances/kodi.appliance
+++ b/target/appliances/kodi.appliance
@@ -23,7 +23,7 @@ config ADK_APPLIANCE_KODI
 	select ADK_PACKAGE_BCM28XX_VC_LIBS if ADK_TARGET_BOARD_BCM28XX
 	select ADK_PACKAGE_BCM28XX_VC_GL_LIBS if ADK_TARGET_BOARD_BCM28XX
 	select ADK_PACKAGE_LIBFSLVPUWRAP if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	select ADK_PACKAGE_GPU_VIV_BIN_MX6Q if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	select ADK_PACKAGE_IMX_GPU_VIV if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_TARGET_ARCH_ARM_WITH_NEON if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	help
 	  Create a small kodi multimedia appliance. Please enable additional features
diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice
index 3b42ead5a..28675ccf2 100644
--- a/target/config/Config.in.libc.choice
+++ b/target/config/Config.in.libc.choice
@@ -101,8 +101,8 @@ config ADK_TARGET_LIB_UCLIBC_0_9_33_2
 	bool "0.9.33.2"
 	depends on ADK_TARGET_LIB_UCLIBC
 
-config ADK_TARGET_LIB_MUSL_1_1_8
-	bool "1.1.8"
+config ADK_TARGET_LIB_MUSL_1_1_9
+	bool "1.1.9"
 	depends on ADK_TARGET_LIB_MUSL
 
 config ADK_TARGET_LIB_MUSL_GIT
diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default
index b9b5b1c73..e689eed8a 100644
--- a/target/config/Config.in.libc.default
+++ b/target/config/Config.in.libc.default
@@ -19,7 +19,7 @@ config ADK_LIBC_VERSION
 	default "1.0.2" if ADK_TARGET_LIB_UCLIBC_NG_1_0_2
 	default "1.0.1" if ADK_TARGET_LIB_UCLIBC_NG_1_0_1
 	default "1.0.0" if ADK_TARGET_LIB_UCLIBC_NG_1_0_0
-	default "1.1.8" if ADK_TARGET_LIB_MUSL_1_1_8
+	default "1.1.9" if ADK_TARGET_LIB_MUSL_1_1_9
 	default "0.9.33.2" if ADK_TARGET_LIB_UCLIBC_0_9_33_2
 	default "2.20" if ADK_TARGET_LIB_GLIBC_2_20
 	default "2.21" if ADK_TARGET_LIB_GLIBC_2_21
diff --git a/target/config/Config.in.mips.choice b/target/config/Config.in.mips.choice
index 71e6c8ea2..7fb09ec3c 100644
--- a/target/config/Config.in.mips.choice
+++ b/target/config/Config.in.mips.choice
@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 choice ADK_TARGET_MIPS_CPU_ARCH
-prompt "MIPS ISA"
+prompt "ISA configuration"
 depends on ADK_TARGET_ARCH_MIPS
 
 config ADK_CPU_MIPS_MIPS32
diff --git a/target/config/Config.in.subsystem b/target/config/Config.in.subsystem
index dab19f2b4..492bc7dc5 100644
--- a/target/config/Config.in.subsystem
+++ b/target/config/Config.in.subsystem
@@ -51,5 +51,3 @@ config ADK_TARGET_HUMMINGBOARD_I2EX
 	select ADK_TARGET_WITH_SATA
 
 endchoice
-
-
diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index 557b12708..2197a89e5 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -4,6 +4,7 @@
 config ADK_TARGET_CFLAGS_OPT
 	string
 	default "-Os -pipe" if ADK_TARGET_CFLAGS_OPT_OS
+	default "-Og -pipe" if ADK_TARGET_CFLAGS_OPT_OG
 	default "-O2 -pipe" if ADK_TARGET_CFLAGS_OPT_O2
 	default "-O3 -pipe" if ADK_TARGET_CFLAGS_OPT_O3
 	default "-O0 -pipe" if ADK_TARGET_CFLAGS_OPT_O0
@@ -15,11 +16,14 @@ bool
 config ADK_TARGET_CFLAGS_OPT_OS
 	prompt "optimize for size (-Os)"
 
+config ADK_TARGET_CFLAGS_OPT_OG
+	prompt "optimize, but allow debugging (-Og)"
+
 config ADK_TARGET_CFLAGS_OPT_O2
 	prompt "optimize for performance (-O2)"
 
 config ADK_TARGET_CFLAGS_OPT_O3
-	prompt "optimize for performance (-O3)"
+	prompt "optimize for extra performance (-O3)"
 
 config ADK_TARGET_CFLAGS_OPT_O0
 	prompt "no optimization (-O0)"