OMAP5: android: defconfig: Enable display and video features

This patch is to enable and display and video related features
to enable android accelerated UI on omap5 dev platform.

Consolidating patches from dra7 to omap5:
--
1)
commit 02668727d1125cd8526369d3e0d5ce9530753532
Author: Sunita Nadampalli <sunitan@ti.com>
OMAPDSS: DSSCOMP: OMAPLFB: Enabling dual FB configuration for multidisplay feature
--
2)
commit d2f13867b69439378e869550e67037eb107a5082
Author: Dandawate Saket <dsaket@ti.com>
OMAPDSS: OMAPLFB: Enable OMAPLFB for compilation
--
3)
commit f5b28cfa40145c8eafec24a4ea0d4f6297ab811f
Author: Dandawate Saket <dsaket@ti.com>
OMAPDSS: DSSCOMP: Configuration changes
--
4)
commit f9df0416a3c54fd879eb41b2dc35b7f25cd5819b
Author: Dandawate Saket <dsaket@ti.com>
OMAPDSS: OMAPFB: Enable OMAPFB in the kernel
--
5)
commit 57256c26ecf2279416be65be5a9c016295b193d8
Author: Dandawate Saket <dsaket@ti.com>
OMAPDSS: OMAPFB: Fix fb initialization
--
6)
commit 15e2bd1fe8dc7a5d1f5d2af7cf8b4258deb0f4c2
Author: Dandawate Saket <dsaket@ti.com>
gpu: ion: Enable ion for compilation
--
7)
commit 9e9fcd68c665bb26c22c0ad56c72c5438450d5f3
Author: Dandawate Saket <dsaket@ti.com>
gpu: ion: Configuration changes
--

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

diff --git a/arch/arm/configs/android_omap5_defconfig b/arch/arm/configs/android_omap5_defconfig
index e27891cb04e95a65f9568a15e91f5f15c4ad5c6d..4335cb16c82ae51f3857380a2f8adbb10176a432 100644 (file)
--- a/arch/arm/configs/android_omap5_defconfig
+++ b/arch/arm/configs/android_omap5_defconfig
@@ -22,6 +22,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_OMAP=y
+CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_MUX_DEBUG=y
 CONFIG_SOC_OMAP5=y
@@ -33,7 +34,7 @@ CONFIG_NR_CPUS=2
 CONFIG_PREEMPT=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200 init=/init androidboot.console=ttyO2"
+CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200 init=/init androidboot.console=ttyO2 vmalloc=496M omapfb.fb_opt=-1,-1,-1,1,1280,720"
 CONFIG_CMDLINE_FORCE=y
 CONFIG_KEXEC=y
 CONFIG_CPU_FREQ=y
@@ -188,17 +189,19 @@ CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_GSPCA=m
-CONFIG_DRM=y
-CONFIG_DRM_OMAP=y
 CONFIG_DRM_OMAP_NUM_CRTCS=3
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
+CONFIG_DSSCOMP=y
+CONFIG_DSSCOMP_DEBUG_LOG=y
 CONFIG_OMAP2_DSS=y
 CONFIG_OMAP2_DSS_DRA7XX_DPI=y
 CONFIG_OMAP2_DSS_RFBI=y
 CONFIG_OMAP2_DSS_SDI=y
 CONFIG_OMAP2_DSS_DSI=y
+CONFIG_FB_OMAP2=y
+CONFIG_OMAPLFB=y
 CONFIG_PANEL_GENERIC_DPI=y
 CONFIG_PANEL_TFP410=y
 CONFIG_PANEL_LGPHILIPS_LB035Q02=y
@@ -215,8 +218,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_PLATFORM=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
@@ -293,6 +294,11 @@ CONFIG_DMADEVICES=y
 CONFIG_TI_EDMA=y
 CONFIG_DMA_OMAP=y
 CONFIG_STAGING=y
+CONFIG_FB=y
+CONFIG_DRM=y
+CONFIG_DRM_OMAP=y
+CONFIG_DRM_OMAP_DISPLAY=n
+CONFIG_DRM_OMAP_DMM_TILER=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ASHMEM=y
@@ -345,5 +351,8 @@ CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC7=y
 CONFIG_LIBCRC32C=y
+CONFIG_ION=y
+CONFIG_ION_OMAP=y
+CONFIG_CMA=y
 CONFIG_TI_DAVINCI_MDIO=y
 CONFIG_TI_DAVINCI_CPDMA=y