UBUNTU: Config: uplevel config for Camera and CMA

Signed-off-by: Sebastien Jan <s-jan@ti.com>

1 files changed, 35 insertions, 3 deletions

diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu
index f7cf36ba26af..cfcfd186feb5 100644
--- a/debian.ti-omap4/config/config.common.ubuntu
+++ b/debian.ti-omap4/config/config.common.ubuntu
@@ -247,6 +247,15 @@ CONFIG_CFG80211_WEXT=y
 # CONFIG_CLEANCACHE is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
+CONFIG_CMA=y
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_MIGRATE_TYPE=y
+CONFIG_CMA_SIZE_ABSOLUTE=16
+CONFIG_CMA_SIZE_SEL_ABSOLUTE=y
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
@@ -568,7 +577,7 @@ CONFIG_FONT_ACORN_8x8=y
 # CONFIG_FONT_PEARL_8x8 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_SUN8x16 is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_FORCE_MAX_ZONEORDER=13
 # CONFIG_FPE_FASTFPE is not set
 CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
@@ -635,6 +644,7 @@ CONFIG_HAVE_ARM_TWD=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1044,9 +1054,15 @@ CONFIG_MACH_OMAP3_PANDORA=y
 CONFIG_MACH_OMAP3_TORPEDO=y
 CONFIG_MACH_OMAP3_TOUCHBOOK=y
 CONFIG_MACH_OMAP4_PANDA=y
+CONFIG_MACH_OMAP4_PANDA_CAMERA_SUPPORT=y
+# CONFIG_MACH_OMAP4_PANDA_CAM_OV5640 is not set
+CONFIG_MACH_OMAP4_PANDA_CAM_OV5650=y
 CONFIG_MACH_OMAP_3430SDP=y
 CONFIG_MACH_OMAP_3630SDP=y
 CONFIG_MACH_OMAP_4430SDP=y
+CONFIG_MACH_OMAP_4430SDP_CAMERA_SUPPORT=y
+# CONFIG_MACH_OMAP_4430SDP_CAM_OV5640 is not set
+CONFIG_MACH_OMAP_4430SDP_CAM_OV5650=y
 CONFIG_MACH_OMAP_LDP=y
 CONFIG_MACH_OMAP_ZOOM2=y
 CONFIG_MACH_OMAP_ZOOM3=y
@@ -1061,7 +1077,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_MD=y
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_MEDIA_CONTROLLER=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_TUNER=y
 CONFIG_MEDIA_TUNER_CUSTOMISE=y
@@ -1118,6 +1134,7 @@ CONFIG_MFD_WL1273_CORE=m
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MG_DISK is not set
 # CONFIG_MICREL_PHY is not set
+CONFIG_MIGRATION=y
 CONFIG_MII=y
 CONFIG_MINIX_FS=y
 # CONFIG_MINIX_SUBPARTITION is not set
@@ -2275,8 +2292,12 @@ CONFIG_VFAT_FS=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEOBUF2_CORE=y
+CONFIG_VIDEOBUF2_DMA_CONTIG=y
+CONFIG_VIDEOBUF2_MEMOPS=y
 CONFIG_VIDEOBUF_DMA_CONTIG=y
 CONFIG_VIDEOBUF_GEN=y
+# CONFIG_VIDEO_ADP1653 is not set
 # CONFIG_VIDEO_ADV7170 is not set
 # CONFIG_VIDEO_ADV7175 is not set
 # CONFIG_VIDEO_ADV7180 is not set
@@ -2301,13 +2322,22 @@ CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_KS0127 is not set
 # CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_M5MOLS is not set
 CONFIG_VIDEO_MEDIA=y
 # CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
 # CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MT9V032 is not set
 # CONFIG_VIDEO_NOON010PC30 is not set
 CONFIG_VIDEO_OMAP2_VOUT=y
 CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
+# CONFIG_VIDEO_OMAP3 is not set
+CONFIG_VIDEO_OMAP4=y
+CONFIG_VIDEO_OMAP4_DEBUG=y
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_VIDEO_OV5640=y
+CONFIG_VIDEO_OV5650=y
 # CONFIG_VIDEO_OV7670 is not set
 # CONFIG_VIDEO_PVRUSB2 is not set
 # CONFIG_VIDEO_SAA6588 is not set
@@ -2335,6 +2365,7 @@ CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
 # CONFIG_VIDEO_USBVISION is not set
 CONFIG_VIDEO_V4L2=y
 CONFIG_VIDEO_V4L2_COMMON=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_VP27SMPX is not set
 # CONFIG_VIDEO_VPFE_CAPTURE is not set
@@ -2414,5 +2445,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 # CONFIG_ZD1211RW is not set
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA_FLAG=0
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA_FLAG=1
 # CONFIG_ZRAM is not set