ti_config_fragments: android: disable android logger

[android-sdk/kernel-video.git] / ti_config_fragments / android_omap.cfg

diff --git a/ti_config_fragments/android_omap.cfg b/ti_config_fragments/android_omap.cfg
index 536290d9267dd712f2ee8766d30d31a0981acad6..1319bedb862dc136797b1c1fa356852baa44d3f9 100644 (file)
--- a/ti_config_fragments/android_omap.cfg
+++ b/ti_config_fragments/android_omap.cfg
@@ -6,13 +6,12 @@
 # Use android/configs/android-recommended.cfg to set google android
 # recommended options
 ###############################################################################
-CONFIG_CMDLINE="root=/dev/mmcblk1p2 rw console=ttyO0,119200 androidboot.console=ttyO0 init=/init rootfstype=ext4 rootwait drm.rnodes=1"
+CONFIG_CMDLINE="root=/dev/mmcblk1p2 rw console=ttyS0,119200 androidboot.console=ttyS0 init=/init rootfstype=ext4 rootwait drm.rnodes=1 snd.slots_reserved=1,1"
 CONFIG_CMDLINE_EXTEND=y
 CONFIG_STAGING=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ASHMEM=y
-CONFIG_ANDROID_LOGGER=y
 CONFIG_ANDROID_TIMED_OUTPUT=y
 CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
@@ -21,6 +20,7 @@ CONFIG_ANDROID_INTF_ALARM_DEV=y
 CONFIG_FUSE_FS=y
 CONFIG_PM_WAKELOCKS=y
 CONFIG_USB_OTG_WAKELOCK=y
+CONFIG_USB_G_ANDROID=y
 
 #enable RPMSG and REMOTEPROC as builtin
 CONFIG_REMOTEPROC=y
@@ -36,3 +36,13 @@ CONFIG_ADF=y
 CONFIG_ADF_FBDEV=y
 CONFIG_ADF_MEMBLOCK=y
 CONFIG_DMA_SHARED_BUFFER=y
+
+#enable USB as builtin
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_G_WEBCAM=n
+
+#enable interactive governor and set that as default
+CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
+