1 files changed, 29 insertions, 12 deletions
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 793a4756866..52b1e05b020 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -257,17 +257,17 @@ CONFIG_CACHE_L2X0=y
 CONFIG_CACHE_PL310=y
 CONFIG_CAIF=y
 # CONFIG_CAIF_DEBUG is not set
-# CONFIG_CAIF_HSI is not set
+CONFIG_CAIF_HSI=m
 CONFIG_CAIF_NETDEV=y
 # CONFIG_CAIF_SPI_SLAVE is not set
-# CONFIG_CAIF_TTY is not set
+CONFIG_CAIF_TTY=m
 # CONFIG_CAN is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_CEPH_FS is not set
 # CONFIG_CEPH_LIB is not set
-CONFIG_CFG80211=m
+CONFIG_CFG80211=y
 # CONFIG_CFG80211_DEBUGFS is not set
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -351,6 +351,7 @@ CONFIG_CPU_TLB_V7=y
 CONFIG_CPU_V7=y
 CONFIG_CRAMFS=m
 CONFIG_CRASH_DUMP=y
+CONFIG_CRASH_SWRESET=y
 CONFIG_CRC16=y
 CONFIG_CRC32=y
 CONFIG_CRC7=y
@@ -516,7 +517,6 @@ CONFIG_DISPLAY_AV8100_TERTIARY=y
 CONFIG_DISPLAY_AV8100_TRIPPLE_BUFFER=y
 # CONFIG_DISPLAY_FICTIVE is not set
 CONFIG_DISPLAY_GENERIC_DSI_PRIMARY=y
-# CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_AUTO_SYNC is not set
 # CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_0 is not set
 # CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_180 is not set
 # CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_270 is not set
@@ -525,7 +525,7 @@ CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_ROTATION_ANGLE=90
 CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y
 # CONFIG_DISPLAY_GENERIC_DSI_SECONDARY is not set
 CONFIG_DISPLAY_GENERIC_PRIMARY=y
-# CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY is not set
+CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY=y
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_DM9000 is not set
 CONFIG_DMADEVICES=y
@@ -953,7 +953,8 @@ CONFIG_IPV6=y
 CONFIG_IP_ADVANCED_ROUTER=y
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_FIB_TRIE_STATS is not set
-# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_MROUTE is not set
+CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_ARPTABLES is not set
 CONFIG_IP_NF_FILTER=y
@@ -1122,7 +1123,8 @@ CONFIG_MCDE_DISPLAY_GENERIC_DSI=y
 # CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE is not set
 # CONFIG_MCDE_DISPLAY_PRIMARY_16BPP is not set
 CONFIG_MCDE_DISPLAY_PRIMARY_32BPP=y
-# CONFIG_MCDE_DISPLAY_SONY_ACX424AKP_DSI is not set
+CONFIG_MCDE_DISPLAY_SAMSUNG_S6D16D0=y
+CONFIG_MCDE_DISPLAY_SONY_ACX424AKP_DSI=y
 CONFIG_MCDE_FB_AVOID_REALLOC=y
 CONFIG_MD=y
 # CONFIG_MDIO_BITBANG is not set
@@ -1513,7 +1515,8 @@ CONFIG_RD_GZIP=y
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_AB5500 is not set
 CONFIG_REGULATOR_AB8500=y
-# CONFIG_REGULATOR_AB8500_DEBUG is not set
+CONFIG_REGULATOR_AB8500_DEBUG=y
+CONFIG_REGULATOR_AB8500_EXT=y
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_BQ24022 is not set
 CONFIG_REGULATOR_DB8500_PRCMU=y
@@ -1679,6 +1682,7 @@ CONFIG_SENSORS_AB8500=y
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_BH1770 is not set
 CONFIG_SENSORS_BH1780=y
+# CONFIG_SENSORS_DBX500 is not set
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_DS620 is not set
@@ -1871,14 +1875,26 @@ CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_STAGING=y
 # CONFIG_STANDALONE is not set
 # CONFIG_STE10XP is not set
-# CONFIG_STE_AUDIO_IO_DEV is not set
 CONFIG_STE_DMA40=y
 CONFIG_STE_TRACE_MODEM=y
 CONFIG_STLC2690_CHIP=y
+CONFIG_STM_CTX_SWITCH=y
+CONFIG_STM_CTX_SWITCH_CHANNEL=253
+CONFIG_STM_FTRACE=y
+CONFIG_STM_FTRACE_CHANNEL=254
 CONFIG_STM_I2S=y
 CONFIG_STM_MSP_I2S=y
 # CONFIG_STM_MSP_SPI is not set
-# CONFIG_STM_TRACE is not set
+CONFIG_STM_NUMBER_OF_CHANNEL=512
+# CONFIG_STM_PRINTK is not set
+CONFIG_STM_STACK_TRACE=y
+CONFIG_STM_STACK_TRACE_CHANNEL=251
+CONFIG_STM_TRACE=y
+CONFIG_STM_TRACE_BPRINTK_CHANNEL=249
+CONFIG_STM_TRACE_PRINTK=y
+CONFIG_STM_TRACE_PRINTK_CHANNEL=250
+CONFIG_STM_WAKEUP=y
+CONFIG_STM_WAKEUP_CHANNEL=252
 CONFIG_STOP_MACHINE=y
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_STRIP_ASM_SYMS is not set
@@ -1930,7 +1946,8 @@ CONFIG_TMPFS_XATTR=y
 CONFIG_TOUCHSCREEN_BU21013=y
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
-# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=y
+CONFIG_TOUCHSCREEN_CYTTSP_SPI=y
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_EETI is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
@@ -1969,7 +1986,6 @@ CONFIG_TREE_PREEMPT_RCU=y
 # CONFIG_TTY_PRINTK is not set
 CONFIG_TUN=y
 # CONFIG_TWL4030_CORE is not set
-# CONFIG_U8500_ACODEC is not set
 CONFIG_U8500_CM=y
 CONFIG_U8500_CPUIDLE_DEEPEST_STATE=2
 CONFIG_U8500_FLASH=y
@@ -2139,6 +2155,7 @@ CONFIG_UX500_CPUIDLE_DEBUG=y
 # CONFIG_UX500_DEBUG_NO_LAUTERBACH is not set
 CONFIG_UX500_DEBUG_UART=2
 CONFIG_UX500_L2X0_PREFETCH_CTRL=y
+CONFIG_UX500_PM_PERFORMANCE=y
 CONFIG_UX500_SOC_COMMON=y
 # CONFIG_UX500_SOC_DB5500 is not set
 CONFIG_UX500_SOC_DB8500=y