LINARO: enable OMAP4 for OMAP flavour

Signed-off-by: John Rigby <john.rigby@linaro.org>

4 files changed, 24 insertions, 19 deletions

diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index dc7eb8d53bd8..c23660556c29 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -10,6 +10,7 @@ CONFIG_ARCH_MXC=y
 # CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARM_ERRATA_430973 is not set
 CONFIG_ARM_L1_CACHE_SHIFT=6
+# CONFIG_ARM_THUMBEE is not set
 # CONFIG_ARM_UNWIND is not set
 CONFIG_ATA=m
 # CONFIG_ATALK is not set
@@ -462,9 +463,6 @@ CONFIG_SWAP=y
 # CONFIG_THERMAL is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_TIPC is not set
-CONFIG_TI_DAVINCI_CPDMA=m
-CONFIG_TI_DAVINCI_EMAC=m
-CONFIG_TI_DAVINCI_MDIO=m
 # CONFIG_TUN is not set
 # CONFIG_TWL4030_CODEC is not set
 CONFIG_UDF_FS=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 6409ea7138e1..e58af3c0229b 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -10,7 +10,9 @@ CONFIG_AF_RXRPC=m
 CONFIG_ARCH_OMAP=y
 # CONFIG_ARCH_VEXPRESS is not set
 CONFIG_ARM_ERRATA_430973=y
-CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_L1_CACHE_SHIFT=5
+CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_UNWIND=y
 CONFIG_ATA=y
 CONFIG_ATALK=m
@@ -191,6 +193,7 @@ CONFIG_HID_ZEROPLUS=m
 CONFIG_HID_ZYDACRON=m
 # CONFIG_HIGHMEM is not set
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_HOTPLUG_CPU=y
 CONFIG_HPFS_FS=m
 CONFIG_HWMON=y
 CONFIG_HW_RANDOM=y
@@ -308,7 +311,7 @@ CONFIG_MTD_ROM=m
 CONFIG_MTD_SLRAM=m
 CONFIG_MTD_TESTS=m
 CONFIG_MTD_UBI=m
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NATIONAL_PHY=y
 CONFIG_NCP_FS=m
 CONFIG_NEON=y
@@ -369,7 +372,7 @@ CONFIG_NLS_ISO8859_9=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
-CONFIG_NOP_USB_XCEIV=m
+CONFIG_NOP_USB_XCEIV=y
 CONFIG_NO_HZ=y
 CONFIG_NTFS_FS=m
 CONFIG_OABI_COMPAT=y
@@ -485,9 +488,6 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_THERMAL=m
 CONFIG_TIMER_STATS=y
 CONFIG_TIPC=m
-CONFIG_TI_DAVINCI_CPDMA=y
-CONFIG_TI_DAVINCI_EMAC=y
-CONFIG_TI_DAVINCI_MDIO=y
 CONFIG_TUN=m
 CONFIG_TWL4030_CODEC=y
 CONFIG_UDF_FS=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 0853d7ee63b7..d580ebaf196e 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -10,7 +10,9 @@ CONFIG_AC97_BUS=y
 # CONFIG_ARCH_OMAP is not set
 CONFIG_ARCH_VEXPRESS=y
 # CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_720789 is not set
 CONFIG_ARM_L1_CACHE_SHIFT=5
+# CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_UNWIND=y
 CONFIG_ATA=m
 # CONFIG_ATALK is not set
@@ -191,6 +193,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_HID_ZYDACRON is not set
 CONFIG_HIGHMEM=y
 # CONFIG_HIGH_RES_TIMERS is not set
+# CONFIG_HOTPLUG_CPU is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HWMON is not set
 # CONFIG_HW_RANDOM is not set
@@ -481,9 +484,6 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_THERMAL is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_TIPC is not set
-CONFIG_TI_DAVINCI_CPDMA=m
-CONFIG_TI_DAVINCI_EMAC=m
-CONFIG_TI_DAVINCI_MDIO=m
 # CONFIG_TUN is not set
 # CONFIG_UDF_FS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index d41c7c6429c0..ad3ece12e95c 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -91,7 +91,7 @@ CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP3430=y
-# CONFIG_ARCH_OMAP4 is not set
+CONFIG_ARCH_OMAP4=y
 CONFIG_ARCH_OMAP_OTG=y
 # CONFIG_ARCH_ORION5X is not set
 # CONFIG_ARCH_PNX4008 is not set
@@ -129,7 +129,6 @@ CONFIG_ARM_AMBA=y
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 # CONFIG_ARM_ERRATA_458693 is not set
 # CONFIG_ARM_ERRATA_460075 is not set
-# CONFIG_ARM_ERRATA_720789 is not set
 # CONFIG_ARM_ERRATA_742230 is not set
 # CONFIG_ARM_ERRATA_742231 is not set
 # CONFIG_ARM_ERRATA_743622 is not set
@@ -137,7 +136,6 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
 # CONFIG_ARM_SP805_WATCHDOG is not set
 CONFIG_ARM_THUMB=y
-# CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_TIMER_SP804=y
 # CONFIG_ARPD is not set
 CONFIG_ASK_IP_FIB_HASH=y
@@ -412,6 +410,7 @@ CONFIG_CPU_HAS_PMU=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_TLB_V7=y
 CONFIG_CPU_V7=y
@@ -873,7 +872,6 @@ CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOTPLUG=y
-# CONFIG_HOTPLUG_CPU is not set
 CONFIG_HTC_EGPIO=y
 CONFIG_HTC_I2CPLD=y
 CONFIG_HTC_PASIC3=m
@@ -1137,7 +1135,6 @@ CONFIG_ISDN_DIVERSION=m
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_ISDN_DRV_HISAX=m
-CONFIG_ISDN_DRV_LOOP=m
 CONFIG_ISDN_HDLC=m
 CONFIG_ISDN_I4L=m
 CONFIG_ISDN_MPP=y
@@ -1350,8 +1347,10 @@ CONFIG_MACH_OMAP3_BEAGLE=y
 CONFIG_MACH_OMAP3_PANDORA=y
 CONFIG_MACH_OMAP3_TORPEDO=y
 CONFIG_MACH_OMAP3_TOUCHBOOK=y
+CONFIG_MACH_OMAP4_PANDA=y
 CONFIG_MACH_OMAP_3430SDP=y
 CONFIG_MACH_OMAP_3630SDP=y
+CONFIG_MACH_OMAP_4430SDP=y
 CONFIG_MACH_OMAP_LDP=y
 CONFIG_MACH_OMAP_ZOOM2=y
 CONFIG_MACH_OMAP_ZOOM3=y
@@ -1455,6 +1454,7 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_SYNAPTICS_I2C=m
+# CONFIG_MPCORE_WATCHDOG is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MTD=y
@@ -1812,16 +1812,17 @@ CONFIG_PDA_POWER=m
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PHYLIB=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_PL310_ERRATA_588369=y
 # CONFIG_PLAT_SPEAR is not set
 CONFIG_PLAT_VERSATILE=y
 CONFIG_PLIP=m
 CONFIG_PMIC_ADP5520=y
 CONFIG_PMIC_DA903X=y
 # CONFIG_PM_ADVANCED_DEBUG is not set
-CONFIG_PM_OPP=y
 CONFIG_PM_OPS=y
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_TEST_SUSPEND=y
 # CONFIG_PM_VERBOSE is not set
 CONFIG_POHMELFS=m
@@ -1875,6 +1876,7 @@ CONFIG_RATIONAL=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RC_MAP=m
@@ -2193,12 +2195,14 @@ CONFIG_SND_OMAP_SOC=y
 # CONFIG_SND_OMAP_SOC_AM3517EVM is not set
 CONFIG_SND_OMAP_SOC_IGEP0020=y
 CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_SND_OMAP_SOC_MCPDM=y
 CONFIG_SND_OMAP_SOC_OMAP3EVM=y
 CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y
 CONFIG_SND_OMAP_SOC_OVERO=y
 CONFIG_SND_OMAP_SOC_RX51=m
 CONFIG_SND_OMAP_SOC_SDP3430=y
+CONFIG_SND_OMAP_SOC_SDP4430=y
 CONFIG_SND_OMAP_SOC_ZOOM2=y
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
@@ -2234,7 +2238,7 @@ CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TLV320DAC33=m
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TWL4030=y
-CONFIG_SND_SOC_TWL6040=m
+CONFIG_SND_SOC_TWL6040=y
 CONFIG_SND_SOC_UDA134X=m
 CONFIG_SND_SOC_UDA1380=m
 CONFIG_SND_SOC_WM2000=m
@@ -2385,6 +2389,9 @@ CONFIG_TIMERFD=y
 # CONFIG_TIPC_ADVANCED is not set
 # CONFIG_TIPC_DEBUG is not set
 CONFIG_TI_DAC7512=m
+CONFIG_TI_DAVINCI_CPDMA=y
+CONFIG_TI_DAVINCI_EMAC=y
+CONFIG_TI_DAVINCI_MDIO=y
 CONFIG_TI_ST=m
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y