summaryrefslogtreecommitdiff
path: root/target/linux/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2014-08-25 23:06:39 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2014-08-25 23:06:39 +0200
commit79b774970c00ba0af4bb6be516af5f44a4299464 (patch)
tree4ebdaf4af170817aad2264fe6402a9f74caf7629 /target/linux/config
parentd8bec99c82105582478f465f8de9e540c8bc8219 (diff)
parent53df4177128b18cff32c7049fc0327fe8c0ee43f (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/config')
-rw-r--r--target/linux/config/Config.in.gpio8
-rw-r--r--target/linux/config/Config.in.graphics37
2 files changed, 43 insertions, 2 deletions
diff --git a/target/linux/config/Config.in.gpio b/target/linux/config/Config.in.gpio
index 6cdc97d18..678b04674 100644
--- a/target/linux/config/Config.in.gpio
+++ b/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
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 9e47b7d1c..bd55b6ffe 100644
--- a/target/linux/config/Config.in.graphics
+++ b/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