enable framebuffer for cubox-i, .15rc1+rmk patches required

3 files changed, 51 insertions, 23 deletions

diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma
index f0a0c5ea9..6ae369052 100644
--- a/target/linux/config/Config.in.dma
+++ b/target/linux/config/Config.in.dma
@@ -7,3 +7,14 @@ config ADK_KERNEL_IMX_SDMA
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
 	depends on ADK_TARGET_SYSTEM_CUBOX_I
 	default n
+
+config ADK_KERNEL_CMA
+	boolean
+
+config ADK_KERNEL_CMA_SIZE_MBYTES
+	int
+	default 256
+
+config ADK_KERNEL_DMA_CMA
+	select ADK_KERNEL_CMA
+	boolean
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index a2d90781f..cb2ba0c4b 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -30,6 +30,9 @@ config ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	default n
 	boolean
 
+config ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
+	boolean
+
 config ADK_KERNEL_MFD_SM501
 	boolean
 
@@ -49,12 +52,6 @@ config ADK_KERNEL_FB_SM501
 	select ADK_KERNEL_MFD_SM501
 	boolean
 
-config ADK_KERNEL_FB_MXC_SYNC_PANEL
-	boolean
-
-config ADK_KERNEL_FB_MXC_HDMI
-	boolean
-
 config ADK_KERNEL_DRM
 	boolean
 
@@ -67,6 +64,30 @@ config ADK_KERNEL_DRM_I915_KMS
 config ADK_KERNEL_DRM_VIVANTE
 	boolean
 
+config ADK_KERNEL_DRM_IMX_FB_HELPER
+	boolean
+
+config ADK_KERNEL_DRM_IMX_HDMI
+	boolean
+
+config ADK_KERNEL_DRM_IMX_PARALLEL_DISPLAY
+	boolean
+
+config ADK_KERNEL_DRM_IMX_LDB
+	boolean
+
+config ADK_KERNEL_DRM_IMX_TVE
+	boolean
+
+config ADK_KERNEL_DRM_IMX_IPUV3_CORE
+	boolean
+
+config ADK_KERNEL_DRM_IMX_IPUV3
+	boolean
+
+config ADK_KERNEL_RESET_CONTROLLER
+	boolean
+
 config ADK_KERNEL_AGP
 	boolean
 
@@ -102,15 +123,23 @@ config ADK_KERNEL_FB_VESA
  	help
 	 Framebuffer support for VirtualBox Emulator.
 
-config ADK_KERNEL_FB_MXS
+config ADK_KERNEL_DRM_IMX
 	prompt "................................ Framebuffer support for Cubox-i"
 	tristate
+	select ADK_KERNEL_DRM
+	select ADK_KERNEL_DMA_CMA
+	select ADK_KERNEL_RESET_CONTROLLER
+	select ADK_KERNEL_DRM_IMX_FB_HELPER
+	select ADK_KERNEL_DRM_IMX_HDMI
+	select ADK_KERNEL_DRM_IMX_LDB
+	select ADK_KERNEL_DRM_IMX_TVE
+	select ADK_KERNEL_DRM_IMX_PARALLEL_DISPLAY
+	select ADK_KERNEL_DRM_IMX_IPUV3
+	select ADK_KERNEL_DRM_IMX_IPUV3_CORE
 	select ADK_KERNEL_FB
+	select ADK_KERNEL_STAGING
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
-	select ADK_KERNEL_FB_MXC_SYNC_PANEL
-	select ADK_KERNEL_FB_MXC_HDMI
-	select ADK_KERNEL_DRM
-	select ADK_KERNEL_DRM_VIVANTE
+	select ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
  	default n
 	depends on ADK_TARGET_SYSTEM_CUBOX_I
diff --git a/target/linux/patches/3.14.1/microblaze-early-printk.patch b/target/linux/patches/3.14.1/microblaze-early-printk.patch
deleted file mode 100644
index 92027cea1..000000000
--- a/target/linux/patches/3.14.1/microblaze-early-printk.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-3.13.6.orig/arch/microblaze/include/asm/setup.h linux-3.13.6/arch/microblaze/include/asm/setup.h
---- linux-3.13.6.orig/arch/microblaze/include/asm/setup.h	2014-03-07 07:07:02.000000000 +0100
-+++ linux-3.13.6/arch/microblaze/include/asm/setup.h	2014-03-12 13:28:53.315145258 +0100
-@@ -19,8 +19,6 @@
- 
- extern char *klimit;
- 
--void early_printk(const char *fmt, ...);
--
- int setup_early_printk(char *opt);
- void remap_early_printk(void);
- void disable_early_printk(void);