UBUNTU: Config update

Signed-off-by: Xavier Boudet <x-boudet@ti.com>

1 files changed, 10 insertions, 14 deletions

diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu
index 865c496b3cb1..f342ce19bf56 100644
--- a/debian.ti-omap4/config/config.common.ubuntu
+++ b/debian.ti-omap4/config/config.common.ubuntu
@@ -141,6 +141,7 @@ CONFIG_ARCH_HAS_OPP=y
 # CONFIG_ARCH_MV78XX0 is not set
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_MXS is not set
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_NOMADIK is not set
 CONFIG_ARCH_NR_GPIO=0
@@ -185,7 +186,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM=y
 # CONFIG_ARM_APPENDED_DTB is not set
-# CONFIG_ARM_ARCH_TIMER is not set
 CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
@@ -1115,6 +1115,7 @@ CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GARP=m
+CONFIG_GATOR=m
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_GENERIC_ACL=y
 CONFIG_GENERIC_BUG=y
@@ -1321,7 +1322,6 @@ CONFIG_HTC_I2CPLD=y
 CONFIG_HTC_PASIC3=m
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_HVC_DCC is not set
-CONFIG_HVC_DRIVER=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HWMON_VID=m
@@ -1331,7 +1331,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_VIRTIO=m
+# CONFIG_HW_RANDOM_VIRTIO is not set
 CONFIG_HZ=128
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
@@ -1479,7 +1479,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_MPU3050 is not set
 # CONFIG_INPUT_MPU6050 is not set
-# CONFIG_INPUT_PCAP is not set
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
 CONFIG_INPUT_POLLDEV=m
@@ -1888,7 +1887,6 @@ CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_TTUSBIR=m
 CONFIG_LIRC_ZILOG=m
 # CONFIG_LIS3L02DQ is not set
-# CONFIG_LIS3L02DQ_BUF_RING_SW is not set
 CONFIG_LITELINK_DONGLE=m
 # CONFIG_LKDTM is not set
 CONFIG_LLC=m
@@ -2566,7 +2564,7 @@ CONFIG_OMAP_32K_TIMER_HZ=128
 # CONFIG_OMAP_ALLOW_OSWR is not set
 CONFIG_OMAP_DIE_GOVERNOR=y
 CONFIG_OMAP_DM_TIMER=y
-CONFIG_OMAP_DUCATI_CMA_SIZE=0x6500000
+CONFIG_OMAP_DSP_CMA_SIZE=0x400000
 CONFIG_OMAP_GPU_GOVERNOR=y
 CONFIG_OMAP_IOMMU=y
 # CONFIG_OMAP_IOVMM is not set
@@ -2584,11 +2582,11 @@ CONFIG_OMAP_REMOTEPROC=m
 CONFIG_OMAP_REMOTEPROC_DSP=y
 CONFIG_OMAP_REMOTEPROC_IPU=y
 CONFIG_OMAP_RESET_CLOCKS=y
+# CONFIG_OMAP_RPMSG_RESMGR is not set
 CONFIG_OMAP_SCM_DEV=y
 CONFIG_OMAP_SMARTREFLEX=y
 # CONFIG_OMAP_SMARTREFLEX_CLASS1P5 is not set
 CONFIG_OMAP_SMARTREFLEX_CLASS3=y
-CONFIG_OMAP_TESLA_CMA_SIZE=0x700000
 CONFIG_OMAP_THERMAL=y
 CONFIG_OMAP_TPS6236X=y
 CONFIG_OMAP_WATCHDOG=y
@@ -2811,7 +2809,6 @@ CONFIG_REGULATOR_MAX8925=m
 CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_MAX8997=m
 CONFIG_REGULATOR_MAX8998=m
-# CONFIG_REGULATOR_PCAP is not set
 CONFIG_REGULATOR_PCF50633=m
 CONFIG_REGULATOR_TPS6105X=m
 # CONFIG_REGULATOR_TPS62360 is not set
@@ -2835,7 +2832,6 @@ CONFIG_REISERFS_FS_XATTR=y
 # CONFIG_REISERFS_PROC_INFO is not set
 CONFIG_RELAY=y
 CONFIG_REMOTEPROC=m
-CONFIG_REMOTEPROC_INACTIVITY_TIMEOUT=5000
 CONFIG_RESOURCE_COUNTERS=y
 CONFIG_RFD_FTL=m
 CONFIG_RFKILL=y
@@ -2913,7 +2909,6 @@ CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_MAX8925=m
 CONFIG_RTC_DRV_MAX8998=m
 CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_PCAP=m
 CONFIG_RTC_DRV_PCF2123=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF8563=m
@@ -3447,6 +3442,7 @@ CONFIG_STMMAC_PLATFORM=m
 CONFIG_STMMAC_RING=y
 CONFIG_STMPE_I2C=y
 # CONFIG_STMPE_SPI is not set
+# CONFIG_STM_ARM is not set
 CONFIG_STM_FW=y
 CONFIG_STM_OMAP_TI1_0=y
 CONFIG_STOP_MACHINE=y
@@ -3463,6 +3459,7 @@ CONFIG_SUSPEND_FREEZER=y
 CONFIG_SWAP=y
 # CONFIG_SWITCH is not set
 CONFIG_SWP_EMULATE=y
+# CONFIG_SYNC is not set
 CONFIG_SYNCLINK_CS=m
 CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
@@ -3558,7 +3555,6 @@ CONFIG_TOUCHSCREEN_MAX11801=m
 CONFIG_TOUCHSCREEN_MCS5000=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_PCAP=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 # CONFIG_TOUCHSCREEN_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_QUANTUM_OBP is not set
@@ -4038,10 +4034,10 @@ CONFIG_VIDEO_VIVI=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIRTIO=m
 # CONFIG_VIRTIO_BALLOON is not set
-CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_CONSOLE=m
+# CONFIG_VIRTIO_BLK is not set
+# CONFIG_VIRTIO_CONSOLE is not set
 # CONFIG_VIRTIO_MMIO is not set
-CONFIG_VIRTIO_NET=m
+# CONFIG_VIRTIO_NET is not set
 CONFIG_VIRTIO_RING=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRT_TO_BUS=y