From e9184df1d809128649d59a937de4b251500c0c7f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 23 Aug 2014 23:08:19 +0200 Subject: combine cubox-i and hummingboard support, same linux patches are required --- target/linux/config/Config.in.graphics | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'target/linux/config/Config.in.graphics') diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 5e2d32482..9e47b7d1c 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -153,17 +153,17 @@ config ADK_KERNEL_FB_VESA config ADK_KERNEL_DRM_DW_HDMI_AUDIO tristate - depends on ADK_TARGET_SYSTEM_CUBOX_I + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on ADK_KERNEL_VERSION_3_16 - #default m if ADK_TARGET_SYSTEM_CUBOX_I + #default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n help config ADK_KERNEL_DRM_DW_HDMI_CEC tristate - depends on ADK_TARGET_SYSTEM_CUBOX_I + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on ADK_KERNEL_VERSION_3_16 - #default m if ADK_TARGET_SYSTEM_CUBOX_I + #default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n help @@ -185,16 +185,15 @@ config ADK_KERNEL_DRM_IMX select ADK_KERNEL_FRAMEBUFFER_CONSOLE select ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY select ADK_KERNEL_I2C_IMX - depends on ADK_TARGET_SYSTEM_CUBOX_I || ADK_TARGET_SYSTEM_HUMMINGBOARD + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on ADK_KERNEL_VERSION_3_16 - default y if ADK_TARGET_SYSTEM_CUBOX_I - default y if ADK_TARGET_SYSTEM_HUMMINGBOARD + default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n help Framebuffer support for Cubox-i/Hummingboard config ADK_KERNEL_DRM_VIVANTE - prompt "Framebuffer support for Cubox-i/Hummingboard" + prompt "Framebuffer support for Cubox-i/Hummingboard (Vivante)" boolean select ADK_KERNEL_DRM select ADK_KERNEL_FB @@ -202,10 +201,9 @@ config ADK_KERNEL_DRM_VIVANTE select ADK_KERNEL_FB_MXS select ADK_KERNEL_FB_MXC_SYNC_PANEL select ADK_KERNEL_FB_MXC_HDMI - depends on ADK_TARGET_SYSTEM_CUBOX_I || ADK_TARGET_SYSTEM_HUMMINGBOARD + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on ADK_KERNEL_VERSION_3_14 - default y if ADK_TARGET_SYSTEM_CUBOX_I - default y if ADK_TARGET_SYSTEM_HUMMINGBOARD + default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n help Framebuffer support for Cubox-i/Hummingboard (Vivante) -- cgit v1.2.3