1 files changed, 31 insertions, 3 deletions

diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu
index f364a0e005c..57f20cb79d4 100644
--- a/debian.ti-omap4/config/config.common.ubuntu
+++ b/debian.ti-omap4/config/config.common.ubuntu
@@ -293,9 +293,6 @@ CONFIG_BITREVERSE=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_BSG is not set
-CONFIG_BLK_DEV_COMPCACHE=m
-# CONFIG_BLK_DEV_COMPCACHE_DEBUG is not set
-# CONFIG_BLK_DEV_COMPCACHE_STATS is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DM=y
@@ -654,6 +651,7 @@ CONFIG_DM9000_DEBUGLEVEL=4
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMM_DMA_API is not set
 CONFIG_DM_CRYPT=m
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_DELAY=m
@@ -680,6 +678,7 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_OMAP=y
 CONFIG_DRM_OMAP_NUM_CRTCS=1
 CONFIG_DS1682=m
+CONFIG_DUCATI_BASEIMAGE_PHYS_ADDR=0x9CF00000
 CONFIG_DUMMY=m
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DVB_AF9013=m
@@ -913,6 +912,7 @@ CONFIG_GAMEPORT_NS558=m
 CONFIG_GARP=m
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_GENERIC_ACL=y
+CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -990,6 +990,7 @@ CONFIG_HAVE_PWM=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_SCHED_CLOCK=y
 CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_HAVE_TI_TILER=y
 # CONFIG_HDLC is not set
 # CONFIG_HDQ_MASTER_OMAP is not set
 # CONFIG_HEADERS_CHECK is not set
@@ -1710,6 +1711,8 @@ CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MPCORE_WATCHDOG is not set
+CONFIG_MPU_SYSLINK_IPC=y
+CONFIG_MPU_SYSLINK_PLATFORM=y
 CONFIG_MSDOS_FS=y
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MTD=y
@@ -2116,7 +2119,10 @@ CONFIG_OMAP2_VRFB=y
 CONFIG_OMAP4_DSS_HDMI=y
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_32K_TIMER_HZ=128
+CONFIG_OMAP_DEVICE_HANDLER=y
 CONFIG_OMAP_DM_TIMER=y
+CONFIG_OMAP_IOMMU=y
+# CONFIG_OMAP_IOMMU_DEBUG is not set
 CONFIG_OMAP_MBOX_FWK=y
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_OMAP_MCBSP=y
@@ -2127,9 +2133,11 @@ CONFIG_OMAP_PACKAGE_CBL=y
 CONFIG_OMAP_PACKAGE_CBS=y
 # CONFIG_OMAP_PM_NONE is not set
 CONFIG_OMAP_PM_NOOP=y
+CONFIG_OMAP_REMOTE_PROC=y
 # CONFIG_OMAP_RESET_CLOCKS is not set
 CONFIG_OMAP_SMARTREFLEX=y
 CONFIG_OMAP_SMARTREFLEX_CLASS3=y
+CONFIG_OMAP_USER_DMM=y
 CONFIG_OMAP_WATCHDOG=y
 CONFIG_OMFS_FS=m
 CONFIG_OPROFILE=y
@@ -2404,6 +2412,7 @@ CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y
 # CONFIG_RTL8192CU is not set
 # CONFIG_RTL8192SE is not set
+# CONFIG_RTS5139 is not set
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_RT_MUTEX_TESTER is not set
@@ -2823,12 +2832,21 @@ CONFIG_SYSCTL_SYSCALL=y
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_SYSLINK_DUCATI_PM=y
+CONFIG_SYSLINK_IOMMU_ENABLE=y
+# CONFIG_SYSLINK_IPU_PM_TRACES is not set
+# CONFIG_SYSLINK_IPU_SELF_HIBERNATION is not set
+CONFIG_SYSLINK_PROC=y
+CONFIG_SYSLINK_PROC4430=y
+CONFIG_SYSLINK_RECOVERY=y
+CONFIG_SYSLINK_USE_SYSMGR=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYSV_FS=m
 # CONFIG_SYS_HYPERVISOR is not set
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_Sys_Link=y
 CONFIG_TABLET_USB_ACECAD=m
 CONFIG_TABLET_USB_AIPTEK=m
 CONFIG_TABLET_USB_GTCO=m
@@ -2869,6 +2887,15 @@ CONFIG_THRUSTMASTER_FF=y
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_TICK_ONESHOT=y
 # CONFIG_TIDSPBRIDGE is not set
+CONFIG_TILER_ALIGNMENT=4096
+CONFIG_TILER_CACHE_LIMIT=40
+CONFIG_TILER_ENABLE_NV12=y
+CONFIG_TILER_ENABLE_USERSPACE=y
+CONFIG_TILER_EXPOSE_SSPTR=y
+CONFIG_TILER_GRANULARITY=128
+# CONFIG_TILER_SECURE is not set
+CONFIG_TILER_SECURITY=1
+CONFIG_TILER_SSPTR_ID=1
 # CONFIG_TIMB_DMA is not set
 CONFIG_TIMERFD=y
 CONFIG_TIMER_STATS=y
@@ -2880,6 +2907,7 @@ CONFIG_TI_DAC7512=m
 # CONFIG_TI_DAVINCI_EMAC is not set
 # CONFIG_TI_DAVINCI_MDIO is not set
 CONFIG_TI_ST=y
+CONFIG_TI_TILER=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y