diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-04 22:42:45 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-04 22:42:45 +0200 |
| commit | 40e730a29b6f8bad5497740d500851213b5818d7 (patch) | |
| tree | 08b21d62d243826cd66dc757cc6aa9b764d47050 | |
| parent | 5bd0b0dfdfb53bb51414918f33362e6d14fb2030 (diff) | |
| parent | 5d071106970b4ecd8ad305fe4c700f594158685e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/modules-3.14.mk | 2 | ||||
| -rw-r--r-- | target/appliances/kodi.appliance | 2 | ||||
| -rw-r--r-- | target/arm/kernel/solidrun-imx6 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk index 013a61ce3..c377c00ff 100644 --- a/mk/build.mk +++ b/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 diff --git a/mk/modules-3.14.mk b/mk/modules-3.14.mk index f00746f4c..2e3f99027 100644 --- a/mk/modules-3.14.mk +++ b/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 diff --git a/target/appliances/kodi.appliance b/target/appliances/kodi.appliance index 68745e69d..68232afa4 100644 --- a/target/appliances/kodi.appliance +++ b/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 diff --git a/target/arm/kernel/solidrun-imx6 b/target/arm/kernel/solidrun-imx6 index c861a5678..1d8e6ec7f 100644 --- a/target/arm/kernel/solidrun-imx6 +++ b/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 |