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

mk/build.mk

@@ -434,7 +434,7 @@ endif
 	fi
 	@if [ ! -z "$(ADK_TARGET_FLOAT)" ];then \
 		grep "^config" target/config/Config.in.float.choice \
-			|grep -i "$(ADK_TARGET_FLOAT)$$" \
+			|grep -i "$(ADK_TARGET_FLOAT)_" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(ADK_TOPDIR)/.defconfig; \
 	fi

mk/modules-3.14.mk

@@ -2,4 +2,4 @@
 # material, please see the LICENCE file in the top-level directory.
 
 USBMODULES:=drivers/usb/usb-common drivers/usb/core/usbcore
-USBUDC:=gadget/udc
+USBUDC:=gadget

target/appliances/kodi.appliance

@@ -1,6 +1,6 @@
 config ADK_APPLIANCE_KODI
 	bool "kodi multimedia appliance"
-	select ADK_KERNEL_VERSION_3_14_35 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	select ADK_KERNEL_VERSION_3_14_40 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_TARGET_LIB_GLIBC
 	select ADK_PACKAGE_GLIBC
 	select ADK_PACKAGE_GLIBC_GCONV

target/arm/kernel/solidrun-imx6

@@ -12,4 +12,4 @@ CONFIG_PCI_IMX6=y
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_ATAGS=y
-CONFIG_CMDLINE_FORCE=y
+CONFIG_CMDLINE_EXTEND=y