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

package/xbmc/Makefile

@@ -68,7 +68,7 @@ PKG_DEPENDS_IBM_X40:=	libsdl libsdl-image libxshmfence libx11 libxext libxt libs
 PKG_DEPENDS_VBOX_X86:=	libsdl libsdl-image libxshmfence libx11 libxext libxt libsm libice
 PKG_BUILDDEP_IBM_X40:=	nasm-host sdl sdl-image
 PKG_BUILDDEP_VBOX_X86:=	nasm-host sdl sdl-image
-PKG_SYSTEM_DEPENDS:=	raspberry-pi ibm-x40 vbox-x86
+PKG_SYSTEM_DEPENDS:=	raspberry-pi ibm-x40 vbox-x86 solidrun-imx6
 
 DIFF_IGNOREFILES:=	configure missing depcomp install-sh INSTALL \
 			aclocal.m4 config.h.in

target/linux/config/Config.in.gpio

@@ -1,3 +1,9 @@
+config ADK_KERNEL_RESET_CONTROLLER
+	boolean
+
+config ADK_KERNEL_RESET_GPIO
+	boolean
+
 config ADK_KERNEL_GPIOLIB
 	boolean
 
@@ -12,5 +18,7 @@ config ADK_KERNEL_GPIO_MXC
 	select ADK_KERNEL_GPIOLIB
 	select ADK_KERNEL_GPIO_SYSFS
 	select ADK_KERNEL_GPIO_GENERIC
+	select ADK_KERNEL_RESET_CONTROLLER
+	select ADK_KERNEL_RESET_GPIO
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n

target/linux/config/Config.in.graphics

@@ -45,7 +45,10 @@ config ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
 config ADK_KERNEL_FRAMEBUFFER_CONSOLE_ROTATION
 	boolean
 
-config ADK_KERNEL_FB_MXS
+config ADK_KERNEL_FB_MXC
+ 	boolean
+
+config ADK_KERNEL_FB_MXC_LDB
  	boolean
 
 config ADK_KERNEL_FB_MXC_SYNC_PANEL
@@ -54,6 +57,27 @@ config ADK_KERNEL_FB_MXC_SYNC_PANEL
 config ADK_KERNEL_FB_MXC_HDMI
  	boolean
 
+config ADK_KERNEL_MXC_IPU
+ 	boolean
+
+config ADK_KERNEL_MXC_GPU_VIV
+ 	boolean
+
+config ADK_KERNEL_MXC_ASRC
+ 	boolean
+
+config ADK_KERNEL_MXC_HDMI_CEC
+ 	boolean
+
+config ADK_KERNEL_MXC_MIPI_CSI2
+ 	boolean
+
+config ADK_KERNEL_MXC_MLB150
+ 	boolean
+
+config ADK_KERNEL_FB_MXC_EDID
+ 	boolean
+
 config ADK_KERNEL_DRM_DW_HDMI_AUDIO
 	tristate
 
@@ -198,9 +222,18 @@ config ADK_KERNEL_DRM_VIVANTE
 	select ADK_KERNEL_DRM
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
-	select ADK_KERNEL_FB_MXS
+	select ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
+	select ADK_KERNEL_FB_MXC
+	select ADK_KERNEL_FB_MXC_LDB
 	select ADK_KERNEL_FB_MXC_SYNC_PANEL
 	select ADK_KERNEL_FB_MXC_HDMI
+	select ADK_KERNEL_MXC_IPU
+	select ADK_KERNEL_MXC_GPU_VIV
+	select ADK_KERNEL_MXC_ASRC
+	select ADK_KERNEL_MXC_HDMI_CEC
+	select ADK_KERNEL_MXC_MIPI_CSI2
+	select ADK_KERNEL_MXC_MLB150
+	select ADK_KERNEL_FB_MXC_EDID
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on ADK_KERNEL_VERSION_3_14
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6