LINARO: Add u8500 flavour

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

8 files changed, 708 insertions, 83 deletions

diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 20dcde49cc0..bf2014d5acc 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -7,6 +7,7 @@
 # CONFIG_AF_RXRPC is not set
 CONFIG_ARCH_MXC=y
 # CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_U8500 is not set
 # CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARM_ERRATA_430973 is not set
 CONFIG_ARM_L1_CACHE_SHIFT=6
@@ -247,6 +248,7 @@ CONFIG_LZO_COMPRESS=y
 CONFIG_MARVELL_PHY=y
 CONFIG_MDIO_BITBANG=y
 # CONFIG_MEDIA_SUPPORT is not set
+# CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SUPPORT=y
 # CONFIG_MICREL_PHY is not set
 CONFIG_MII=m
@@ -490,7 +492,6 @@ CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_MON is not set
-# CONFIG_USB_MUSB_HDRC is not set
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_PEGASUS is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index fda8c530ea7..0b16f34d1b4 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -3,27 +3,32 @@
 #
 CONFIG_AC97_BUS=m
 CONFIG_ADFS_FS=m
+CONFIG_ADIS16255=m
 CONFIG_AFFS_FS=m
 CONFIG_AFS_FS=m
 CONFIG_AF_RXRPC=m
 # CONFIG_ARCH_MXC is not set
 CONFIG_ARCH_OMAP=y
+# CONFIG_ARCH_U8500 is not set
 # CONFIG_ARCH_VEXPRESS is not set
 CONFIG_ARM_ERRATA_430973=y
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_ARM_L1_CACHE_SHIFT=5
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_UNWIND=y
+CONFIG_ASUS_OLED=m
 CONFIG_ATA=y
 CONFIG_ATALK=m
 CONFIG_ATA_OVER_ETH=m
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATM=m
 CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS_FS=m
 CONFIG_AUXDISPLAY=y
 CONFIG_AX88796=m
 CONFIG_B44=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BATMAN_ADV=m
 CONFIG_BEFS_FS=m
 CONFIG_BFS_FS=m
 CONFIG_BINARY_PRINTF=y
@@ -126,6 +131,7 @@ CONFIG_DLM=m
 CONFIG_DMADEVICES=y
 CONFIG_DNET=m
 CONFIG_EARLY_PRINTK=y
+CONFIG_ECHO=m
 CONFIG_ECONET=m
 CONFIG_EFS_FS=m
 # CONFIG_EMBEDDED is not set
@@ -138,6 +144,7 @@ CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT4_FS_XATTR=y
+CONFIG_EZX_PCAP=y
 CONFIG_FAT_FS=m
 CONFIG_FB_ARMCLCD=m
 CONFIG_FB_BROADSHEET=m
@@ -147,6 +154,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_MB862XX=m
 CONFIG_FB_METRONOME=m
 CONFIG_FB_S1D13XXX=m
+CONFIG_FB_SM7XX=m
 # CONFIG_FIXED_PHY is not set
 CONFIG_FONTS=y
 CONFIG_FPE_NWFPE=y
@@ -196,6 +204,7 @@ CONFIG_I2C=y
 CONFIG_I2C_COMPAT=y
 CONFIG_ICPLUS_PHY=y
 CONFIG_IEEE802154=m
+CONFIG_IIO=m
 # CONFIG_IKCONFIG is not set
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
@@ -244,6 +253,7 @@ CONFIG_LAPB=m
 CONFIG_LBDAF=y
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
+CONFIG_LEDS_REGULATOR=m
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=0
 CONFIG_LOGIG940_FF=y
@@ -254,10 +264,12 @@ CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LSI_ET1011C_PHY=y
 CONFIG_LXT_PHY=y
 CONFIG_LZO_COMPRESS=m
+# CONFIG_MACH_NO_WESTBRIDGE is not set
 CONFIG_MACVLAN=m
 CONFIG_MARVELL_PHY=y
 CONFIG_MDIO_BITBANG=y
 CONFIG_MEDIA_SUPPORT=m
+# CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SUPPORT=y
 CONFIG_MICREL_PHY=m
 CONFIG_MII=y
@@ -368,11 +380,13 @@ CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_NO_HZ=y
+CONFIG_NR_CPUS=4
 CONFIG_NTFS_FS=m
 CONFIG_OABI_COMPAT=y
 CONFIG_OCFS2_FS=m
 CONFIG_OC_ETM=y
 CONFIG_OMFS_FS=m
+CONFIG_PANEL=m
 CONFIG_PANTHERLORD_FF=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_PERF_COUNTERS=y
@@ -381,6 +395,7 @@ CONFIG_PHONET=m
 CONFIG_PID_NS=y
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
+CONFIG_POHMELFS=m
 CONFIG_POWER_SUPPLY=y
 CONFIG_PPS=m
 # CONFIG_PREEMPT_NONE is not set
@@ -398,6 +413,25 @@ CONFIG_RAW_DRIVER=m
 CONFIG_RDS=m
 CONFIG_REALTEK_PHY=y
 CONFIG_REGULATOR=y
+CONFIG_REGULATOR_88PM8607=y
+CONFIG_REGULATOR_AB3100=m
+CONFIG_REGULATOR_BQ24022=m
+CONFIG_REGULATOR_DA903X=m
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8925=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TWL4030=y
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_WM8350=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_WM8994=m
 CONFIG_REISERFS_FS=m
 CONFIG_RELAY=y
 CONFIG_RFD_FTL=m
@@ -447,6 +481,7 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SLIP=y
 CONFIG_SLUB_DEBUG=y
+CONFIG_SMB_FS=m
 CONFIG_SMC911X=m
 CONFIG_SMC91X=m
 CONFIG_SMSC911X=y
@@ -465,6 +500,7 @@ CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SPI=y
+# CONFIG_SPI_PL022 is not set
 CONFIG_SSFDC=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
@@ -478,6 +514,32 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_THERMAL=m
 CONFIG_TIMER_STATS=y
 CONFIG_TIPC=m
+CONFIG_TOUCHSCREEN_88PM860X=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_DA9034=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_W90X900=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TRANZPORT=m
 CONFIG_TUN=m
 CONFIG_TWL6030_USB=m
 CONFIG_UDF_FS=m
@@ -504,6 +566,7 @@ CONFIG_USB_HWA_HCD=m
 CONFIG_USB_IDMOUSE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_IPHETH=m
+CONFIG_USB_IP_COMMON=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
@@ -515,7 +578,6 @@ CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 CONFIG_USB_MON=m
-CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_OTG=y
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_PEGASUS=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
new file mode 100644
index 00000000000..0e5ad277a6b
--- /dev/null
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -0,0 +1,601 @@
+#
+# Config options for config.flavour.linaro-u8500 automatically generated by splitconfig.pl
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_ADIS16255 is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_OMAP is not set
+CONFIG_ARCH_U8500=y
+# CONFIG_ARCH_VEXPRESS is not set
+# 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 is not set
+# CONFIG_ASUS_OLED is not set
+CONFIG_ATA=m
+# CONFIG_ATALK is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+# CONFIG_ATM is not set
+CONFIG_AUTOFS4_FS=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_AX88796 is not set
+# CONFIG_B44 is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_BINARY_PRINTF is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_MISC=m
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_BONDING is not set
+# CONFIG_BRIDGE is not set
+CONFIG_BROADCOM_PHY=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_BT is not set
+# CONFIG_CAIF is not set
+# CONFIG_CAN is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_CGROUPS is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_ST is not set
+CONFIG_CICADA_PHY=y
+# CONFIG_CIFS is not set
+CONFIG_CMDLINE="root=/dev/ram0 console=ttyAMA2,115200n8"
+# CONFIG_CODA_FS is not set
+CONFIG_CONFIGFS_FS=m
+CONFIG_CONNECTOR=y
+# CONFIG_CPU_IDLE is not set
+# CONFIG_CRAMFS is not set
+CONFIG_CRC_T10DIF=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_ECB=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_GHASH is not set
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_PCBC is not set
+CONFIG_CRYPTO_PCOMP2=y
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_RNG2=y
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SEQIV is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_VMAC is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_ZLIB is not set
+CONFIG_DAVICOM_PHY=y
+# CONFIG_DCB is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_DECNET is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_DLM is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_DNET is not set
+CONFIG_EARLY_PRINTK=y
+# CONFIG_ECHO is not set
+# CONFIG_ECONET is not set
+# CONFIG_EFS_FS is not set
+CONFIG_EMBEDDED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_EQUALIZER is not set
+# CONFIG_ETHOC is not set
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT4_FS_XATTR=y
+# CONFIG_EZX_PCAP is not set
+CONFIG_FAT_FS=y
+# CONFIG_FB_ARMCLCD is not set
+# CONFIG_FB_BROADSHEET is not set
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_IMAGEBLIT=m
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_SM7XX is not set
+CONFIG_FIXED_PHY=y
+# CONFIG_FONTS is not set
+CONFIG_FREEZER=y
+# CONFIG_FSCACHE is not set
+# CONFIG_FTL is not set
+# CONFIG_FTRACE is not set
+CONFIG_FUSE_FS=y
+# CONFIG_GAMEPORT is not set
+CONFIG_GPIOLIB=y
+# CONFIG_GPIO_BASIC_MMIO is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_3M_PCT is not set
+# CONFIG_HID_CANDO is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EGALAX is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_MOSART is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PID is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_STANTUM is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_HPFS_FS is not set
+# CONFIG_HWMON is not set
+CONFIG_HW_RANDOM=y
+CONFIG_HZ=100
+CONFIG_I2C=y
+# CONFIG_I2C_COMPAT is not set
+CONFIG_ICPLUS_PHY=y
+# CONFIG_IEEE802154 is not set
+# CONFIG_IIO is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INFTL is not set
+CONFIG_INPUT_EVBUG=m
+CONFIG_INPUT_FF_MEMLESS=m
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_POLLDEV=m
+# CONFIG_INPUT_SPARSEKMAP is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_IPC_NS is not set
+# CONFIG_IPX is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_MULTICAST is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_SCTP is not set
+# CONFIG_ISDN is not set
+# CONFIG_JFFS2_FS is not set
+CONFIG_KALLSYMS_ALL=y
+# CONFIG_KEXEC is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYS=y
+# CONFIG_KGDB is not set
+# CONFIG_KPROBES is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_L2TP is not set
+# CONFIG_LAPB is not set
+# CONFIG_LBDAF is not set
+CONFIG_LEDS_LP5521=y
+CONFIG_LEDS_LP5523=m
+# CONFIG_LEDS_REGULATOR is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LOGIG940_FF is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGO is not set
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_LSI_ET1011C_PHY=y
+CONFIG_LXT_PHY=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_MACH_NO_WESTBRIDGE=y
+# CONFIG_MACVLAN is not set
+CONFIG_MARVELL_PHY=y
+CONFIG_MDIO_BITBANG=y
+# CONFIG_MEDIA_SUPPORT is not set
+CONFIG_MFD_STMPE=y
+CONFIG_MFD_SUPPORT=y
+# CONFIG_MICREL_PHY is not set
+CONFIG_MII=m
+# CONFIG_MINIX_FS is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_MMC_ARMMMCI=y
+# CONFIG_MMC_CLKGATE is not set
+# CONFIG_MMC_DW is not set
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ELANTECH=y
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_JEDECPROBE is not set
+# CONFIG_MTD_LPDDR is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_UBI is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_NATIONAL_PHY=y
+# CONFIG_NCP_FS is not set
+CONFIG_NEON=y
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_9P is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_KEY is not set
+# CONFIG_NET_NS is not set
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_NFSD is not set
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+# CONFIG_NFTL is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_NLS_ASCII=y
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_DEFAULT="cp437"
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+CONFIG_NLS_ISO8859_15=m
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+# CONFIG_NOP_USB_XCEIV is not set
+CONFIG_NO_HZ=y
+CONFIG_NR_CPUS=2
+# CONFIG_NTFS_FS is not set
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_OC_ETM is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_PANEL is not set
+# CONFIG_PANTHERLORD_FF is not set
+# CONFIG_PARTITION_ADVANCED is not set
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_PHONE is not set
+# CONFIG_PHONET is not set
+# CONFIG_PID_NS is not set
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+# CONFIG_POHMELFS is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_PPS is not set
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_PROFILING is not set
+# CONFIG_QNX4FS_FS is not set
+CONFIG_QSEMI_PHY=y
+CONFIG_QUOTA=y
+CONFIG_QUOTACTL=y
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_RAMOOPS is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_RDS is not set
+CONFIG_REALTEK_PHY=y
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_88PM8607 is not set
+CONFIG_REGULATOR_AB3100=y
+# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_DA903X is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8925 is not set
+# CONFIG_REGULATOR_PCF50633 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TWL4030 is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_WM8350 is not set
+# CONFIG_REGULATOR_WM8400 is not set
+# CONFIG_REGULATOR_WM8994 is not set
+# CONFIG_REISERFS_FS is not set
+CONFIG_RELAY=y
+# CONFIG_RFD_FTL is not set
+# CONFIG_RFKILL is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_PL030 is not set
+CONFIG_RTC_DRV_PL031=y
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+# CONFIG_SATA_AHCI_PLATFORM is not set
+CONFIG_SATA_PMP=y
+CONFIG_SCHEDSTATS=y
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCSI_CONSTANTS=y
+# CONFIG_SCSI_DH is not set
+CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_PROC_FS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+CONFIG_SCSI_SCAN_ASYNC=y
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SDIO_UART is not set
+# CONFIG_SERIAL_8250 is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+CONFIG_SERIAL_AMBA_PL011=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_AMBAKMI is not set
+# CONFIG_SERIO_RAW is not set
+CONFIG_SERIO_SERPORT=m
+# CONFIG_SLIP is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMC91X is not set
+# CONFIG_SMSC911X is not set
+CONFIG_SMSC_PHY=y
+# CONFIG_SM_FTL is not set
+# CONFIG_SND_ARMAACI is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_MIXER_OSS is not set
+CONFIG_SND_PCM=m
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_SOC is not set
+CONFIG_SND_TIMER=m
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SOUND_OSS_CORE is not set
+CONFIG_SPI=y
+CONFIG_SPI_PL022=y
+# CONFIG_SSFDC is not set
+CONFIG_STAGING=y
+# CONFIG_STANDALONE is not set
+CONFIG_STE10XP=y
+# CONFIG_SWP_EMULATE is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_THERMAL is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_TIPC is not set
+# CONFIG_TOUCHSCREEN_88PM860X is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+CONFIG_TOUCHSCREEN_BU21013=y
+CONFIG_TOUCHSCREEN_DA9034=y
+# CONFIG_TOUCHSCREEN_DYNAPRO is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_TPS6507X is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_TUN is not set
+# CONFIG_TWL6030_USB is not set
+CONFIG_UDF_FS=m
+CONFIG_UEVENT_HELPER_PATH=""
+# CONFIG_UFS_FS is not set
+# CONFIG_UIO is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_SERIAL is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_TMC is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+CONFIG_USB_UAS=m
+# CONFIG_USB_ULPI is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_USER_NS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_VETH is not set
+CONFIG_VFAT_FS=y
+CONFIG_VITESSE_PHY=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_W1 is not set
+# CONFIG_WAN is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_WIMAX is not set
+# CONFIG_WIRELESS is not set
+# CONFIG_WLAN is not set
+# CONFIG_X25 is not set
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFS_FS is not set
+CONFIG_ZLIB_DEFLATE=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 654c5bb74d0..4146daa9356 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -8,6 +8,7 @@ CONFIG_AC97_BUS=y
 # CONFIG_AF_RXRPC is not set
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_U8500 is not set
 CONFIG_ARCH_VEXPRESS=y
 # CONFIG_ARM_ERRATA_430973 is not set
 # CONFIG_ARM_ERRATA_720789 is not set
@@ -363,6 +364,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_NO_HZ is not set
+CONFIG_NR_CPUS=4
 # CONFIG_NTFS_FS is not set
 CONFIG_OABI_COMPAT=y
 # CONFIG_OCFS2_FS is not set
@@ -507,7 +509,6 @@ CONFIG_USB_ISP1760_HCD=y
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
 CONFIG_USB_MON=y
-# CONFIG_USB_MUSB_HDRC is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PRINTER is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index e354e6bcb1e..c65d6b48951 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -8,6 +8,10 @@ CONFIG_9P_FS=m
 CONFIG_AB3100_CORE=y
 CONFIG_AB3100_OTP=m
 CONFIG_AB3550_CORE=y
+CONFIG_AB8500_CORE=y
+CONFIG_AB8500_DEBUG=y
+CONFIG_AB8500_I2C_CORE=y
+# CONFIG_AB8500_USB is not set
 CONFIG_ABX500_CORE=y
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_ACORN_PARTITION=y
@@ -28,7 +32,6 @@ CONFIG_AD525X_DPOT_SPI=m
 CONFIG_ADIS16209=m
 CONFIG_ADIS16220=m
 CONFIG_ADIS16240=m
-CONFIG_ADIS16255=m
 CONFIG_ADIS16260=m
 CONFIG_ADIS16300=m
 CONFIG_ADIS16350=m
@@ -123,7 +126,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_TCC_926 is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_U8500 is not set
 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set
 # CONFIG_ARCH_VERSATILE is not set
 CONFIG_ARCH_VEXPRESS_CA9X4=y
@@ -145,7 +147,6 @@ CONFIG_ARM_THUMB=y
 CONFIG_ARM_TIMER_SP804=y
 # CONFIG_ARPD is not set
 CONFIG_ASK_IP_FIB_HASH=y
-CONFIG_ASUS_OLED=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_PQ=m
@@ -195,7 +196,6 @@ CONFIG_AUFS_POLL=y
 CONFIG_AUFS_SBILIST=y
 # CONFIG_AUFS_SHWH is not set
 # CONFIG_AUFS_SP_IATTR is not set
-CONFIG_AUTOFS_FS=m
 # CONFIG_AUTO_ZRELADDR is not set
 CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
@@ -227,7 +227,6 @@ CONFIG_BACKLIGHT_PCF50633=m
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_FULL=y
 CONFIG_BASE_SMALL=0
-CONFIG_BATMAN_ADV=m
 # CONFIG_BATMAN_ADV_DEBUG is not set
 # CONFIG_BATTERY_BQ20Z75 is not set
 CONFIG_BATTERY_BQ27x00=m
@@ -662,7 +661,6 @@ CONFIG_DVB_ZL10039=m
 CONFIG_DVB_ZL10353=m
 # CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_EASYCAP is not set
-CONFIG_ECHO=m
 CONFIG_ECONET_AUNUDP=y
 CONFIG_ECONET_NATIVE=y
 CONFIG_ECRYPT_FS=y
@@ -677,6 +675,7 @@ CONFIG_ELF_CORE=y
 CONFIG_EPOLL=y
 CONFIG_ESI_DONGLE=m
 CONFIG_EVENTFD=y
+# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
 CONFIG_EVENT_TRACING=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_EXPORTFS=m
@@ -692,7 +691,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EZX_PCAP=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_FANOTIFY is not set
 CONFIG_FAT_DEFAULT_CODEPAGE=437
@@ -713,7 +711,6 @@ CONFIG_FB_OMAP2_NUM_FBS=3
 # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
 # CONFIG_FB_OMAP_LCD_VGA is not set
 CONFIG_FB_SM501=m
-CONFIG_FB_SM7XX=m
 # CONFIG_FB_SVGALIB is not set
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_FILLRECT=m
@@ -805,6 +802,7 @@ CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PL061 is not set
+CONFIG_GPIO_STMPE=y
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TC3589X=y
@@ -819,6 +817,7 @@ CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_MTU=y
 CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARM_SCU=y
@@ -921,6 +920,7 @@ CONFIG_HTC_PASIC3=m
 CONFIG_HWMON_VID=m
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_PERF_EVENTS=y
+CONFIG_HW_RANDOM_NOMADIK=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_ALGOPCA=m
@@ -935,6 +935,7 @@ CONFIG_I2C_GPIO=m
 # CONFIG_I2C_HELPER_AUTO is not set
 # CONFIG_I2C_IMX is not set
 # CONFIG_I2C_MUX is not set
+CONFIG_I2C_NOMADIK=y
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_OMAP=y
 CONFIG_I2C_PARPORT=m
@@ -961,7 +962,6 @@ CONFIG_ICST=y
 CONFIG_IEEE802154_DRIVERS=m
 # CONFIG_IEEE802154_FAKEHARD is not set
 CONFIG_IFB=m
-CONFIG_IIO=m
 CONFIG_IIO_GPIO_TRIGGER=m
 CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
 CONFIG_IIO_RING_BUFFER=y
@@ -1024,6 +1024,7 @@ CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=y
 CONFIG_INPUT_88PM860X_ONKEY=m
+CONFIG_INPUT_AB8500_PONKEY=y
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
@@ -1269,9 +1270,11 @@ CONFIG_KEYBOARD_LM8323=m
 CONFIG_KEYBOARD_MATRIX=m
 CONFIG_KEYBOARD_MAX7359=m
 # CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_NOMADIK is not set
 CONFIG_KEYBOARD_OMAP4=m
 # CONFIG_KEYBOARD_QT2160 is not set
-CONFIG_KEYBOARD_TC3589X=m
+CONFIG_KEYBOARD_STMPE=y
+# CONFIG_KEYBOARD_TC3589X is not set
 CONFIG_KEYBOARD_TCA6416=m
 CONFIG_KEYBOARD_TWL4030=m
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
@@ -1316,7 +1319,6 @@ CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
@@ -1396,7 +1398,6 @@ CONFIG_MACH_MX51_EFIKAMX=y
 # CONFIG_MACH_MX53_SMD is not set
 CONFIG_MACH_NOKIA_RM680=y
 CONFIG_MACH_NOKIA_RX51=y
-# CONFIG_MACH_NO_WESTBRIDGE is not set
 CONFIG_MACH_OMAP3517EVM=y
 CONFIG_MACH_OMAP3530_LV_SOM=y
 CONFIG_MACH_OMAP3EVM=y
@@ -1414,6 +1415,8 @@ CONFIG_MACH_OMAP_ZOOM2=y
 CONFIG_MACH_OMAP_ZOOM3=y
 CONFIG_MACH_OVERO=y
 CONFIG_MACH_SBC3530=y
+CONFIG_MACH_U5500=y
+CONFIG_MACH_U8500=y
 # CONFIG_MACVTAP is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ=y
@@ -1465,7 +1468,6 @@ CONFIG_MFD_MAX8925=y
 CONFIG_MFD_PCF50633=m
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SM501_GPIO is not set
-# CONFIG_MFD_STMPE is not set
 CONFIG_MFD_T7L66XB=y
 CONFIG_MFD_TC3589X=y
 CONFIG_MFD_TC6387XB=y
@@ -1584,7 +1586,6 @@ CONFIG_MTD_UBI_BEB_RESERVE=1
 CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 # CONFIG_MULTICORE_RAID456 is not set
-# CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_MXC_DEBUG_BOARD is not set
 # CONFIG_MXC_IRQ_PRIOR is not set
 # CONFIG_MXC_PWM is not set
@@ -1796,8 +1797,8 @@ CONFIG_NL80211_TESTMODE=y
 CONFIG_NLATTR=y
 CONFIG_NLS=y
 CONFIG_NLS_ISO8859_1=m
+CONFIG_NOMADIK_GPIO=y
 CONFIG_NOP_TRACER=y
-CONFIG_NR_CPUS=4
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_RW is not set
 CONFIG_NVRAM=m
@@ -1857,7 +1858,6 @@ CONFIG_PACKET=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PAGE_POISONING is not set
-CONFIG_PANEL=m
 CONFIG_PANEL_ACX565AKM=m
 # CONFIG_PANEL_CHANGE_MESSAGE is not set
 CONFIG_PANEL_GENERIC_DPI=y
@@ -1884,6 +1884,7 @@ CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PHYLIB=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_PL310_ERRATA_588369=y
+CONFIG_PLAT_NOMADIK=y
 # CONFIG_PLAT_SPEAR is not set
 CONFIG_PLAT_VERSATILE=y
 CONFIG_PLIP=m
@@ -1897,7 +1898,6 @@ CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_TEST_SUSPEND=y
 # CONFIG_PM_VERBOSE is not set
-CONFIG_POHMELFS=m
 CONFIG_POHMELFS_CRYPTO=y
 # CONFIG_POHMELFS_DEBUG is not set
 CONFIG_POSIX_MQUEUE=y
@@ -1963,32 +1963,14 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_REGULATOR_88PM8607=y
-CONFIG_REGULATOR_AB3100=m
+CONFIG_REGULATOR_AB8500=y
 # CONFIG_REGULATOR_AD5398 is not set
-CONFIG_REGULATOR_BQ24022=m
-CONFIG_REGULATOR_DA903X=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR_DUMMY is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_ISL6271A is not set
-CONFIG_REGULATOR_LP3971=m
 # CONFIG_REGULATOR_LP3972 is not set
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8925=m
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_PCAP is not set
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_TWL4030=y
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
-CONFIG_REGULATOR_WM8350=m
-CONFIG_REGULATOR_WM8400=m
-CONFIG_REGULATOR_WM8994=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
@@ -2027,6 +2009,7 @@ CONFIG_RT73USB=m
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
 CONFIG_RTC_DRV_AB3100=m
+CONFIG_RTC_DRV_AB8500=y
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_DS1305=m
 CONFIG_RTC_DRV_DS1307=m
@@ -2250,7 +2233,6 @@ CONFIG_SLUB=y
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMB_FS=m
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
@@ -2400,7 +2382,6 @@ CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_OMAP24XX=m
-# CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
 # CONFIG_SPI_SPIDEV is not set
 CONFIG_SPI_TLE62X0=m
@@ -2494,36 +2475,14 @@ CONFIG_TI_ST=m
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TOIM3232_DONGLE=m
-CONFIG_TOUCHSCREEN_88PM860X=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 # CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_BU21013=m
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
-CONFIG_TOUCHSCREEN_DA9034=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_PCAP=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
 # CONFIG_TOUCHSCREEN_QT602240 is not set
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_STMPE is not set
 CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
 CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
@@ -2539,8 +2498,6 @@ CONFIG_TOUCHSCREEN_USB_JASTEC=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_W90X900=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
 CONFIG_TOUCHSCREEN_WM9705=y
 CONFIG_TOUCHSCREEN_WM9712=y
 CONFIG_TOUCHSCREEN_WM9713=y
@@ -2552,7 +2509,6 @@ CONFIG_TRACER_MAX_TRACE=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_TRACING=y
 CONFIG_TRACING_SUPPORT=y
-CONFIG_TRANZPORT=m
 CONFIG_TREE_RCU=y
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_TTPCI_EEPROM is not set
@@ -2563,6 +2519,8 @@ CONFIG_TWL4030_POWER=y
 CONFIG_TWL4030_USB=m
 CONFIG_TWL4030_WATCHDOG=m
 # CONFIG_TWL6030_PWM is not set
+CONFIG_U5500_MBOX=y
+CONFIG_U5500_MODEM_IRQ=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 CONFIG_UBIFS_FS=m
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
@@ -2621,11 +2579,10 @@ CONFIG_USB_GADGETFS=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_DEBUG_FS=y
-CONFIG_USB_GADGET_DUALSPEED=y
+# CONFIG_USB_GADGET_DUALSPEED is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 # CONFIG_USB_GADGET_M66592 is not set
-CONFIG_USB_GADGET_MUSB_HDRC=y
-# CONFIG_USB_GADGET_OMAP is not set
+CONFIG_USB_GADGET_OMAP=y
 # CONFIG_USB_GADGET_PXA_U2O is not set
 # CONFIG_USB_GADGET_R8A66597 is not set
 CONFIG_USB_GADGET_SELECTED=y
@@ -2683,8 +2640,6 @@ CONFIG_USB_G_WEBCAM=m
 CONFIG_USB_HID=m
 CONFIG_USB_HSO=m
 CONFIG_USB_IBMCAM=m
-# CONFIG_USB_INVENTRA_DMA is not set
-CONFIG_USB_IP_COMMON=m
 # CONFIG_USB_IP_DEBUG_ENABLE is not set
 CONFIG_USB_IP_HOST=m
 CONFIG_USB_IP_VHCI_HCD=m
@@ -2699,14 +2654,7 @@ CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_MIDI_GADGET=m
 # CONFIG_USB_MOUSE is not set
 CONFIG_USB_MR800=m
-# CONFIG_USB_MUSB_AM35X is not set
-# CONFIG_USB_MUSB_DEBUG is not set
-CONFIG_USB_MUSB_HDRC_HCD=y
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_OMAP2PLUS is not set
-CONFIG_USB_MUSB_OTG=y
-# CONFIG_USB_MUSB_PERIPHERAL is not set
-CONFIG_USB_MUSB_TUSB6010=y
+# CONFIG_USB_MUSB_HDRC is not set
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_EEM=m
@@ -2729,6 +2677,7 @@ CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_OMAP3=y
 # CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_OMAP=y
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_OTG_WHITELIST is not set
@@ -2815,8 +2764,6 @@ CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_STV06XX=m
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_SUSPEND=y
-# CONFIG_USB_TI_CPPI_DMA is not set
-CONFIG_USB_TUSB_OMAP_DMA=y
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_USBNET=m
@@ -2835,6 +2782,10 @@ CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_I1480U=m
+CONFIG_UX500_DEBUG_UART=2
+CONFIG_UX500_SOC_COMMON=y
+CONFIG_UX500_SOC_DB5500=y
+CONFIG_UX500_SOC_DB8500=y
 CONFIG_V4L2_MEM2MEM_DEV=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_V4L_USB_DRIVERS=y
diff --git a/debian.linaro/control.d/vars.linaro-u8500 b/debian.linaro/control.d/vars.linaro-u8500
new file mode 100644
index 00000000000..e9146437613
--- /dev/null
+++ b/debian.linaro/control.d/vars.linaro-u8500
@@ -0,0 +1,8 @@
+arch="armel"
+supported="ST-Ericsson U8500"
+desc="ST-Ericsson U8500 based platforms"
+target="ST-Ericsson HREF platform"
+bootloader="uboot-mkimage, flash-kernel"
+provides=""
+section_image="universe/base"
+do_debug="Yes"
diff --git a/debian.linaro/d-i/kernel-versions.in b/debian.linaro/d-i/kernel-versions.in
index ac3ae253786..cedf86cca62 100644
--- a/debian.linaro/d-i/kernel-versions.in
+++ b/debian.linaro/d-i/kernel-versions.in
@@ -2,5 +2,6 @@
 armel	PKGVER-ABINUM	linaro-mx51	PKGVER-ABINUM-linaro-mx51	-
 armel	PKGVER-ABINUM	linaro-omap	PKGVER-ABINUM-linaro-omap	-
 armel	PKGVER-ABINUM	linaro-vexpress	PKGVER-ABINUM-linaro-vexpress	-
+armel	PKGVER-ABINUM	linaro-u8500	PKGVER-ABINUM-linaro-u8500	-
 # Ports
 # arch	version		flavour		installedname			suffix	bdep
diff --git a/debian.linaro/rules.d/armel.mk b/debian.linaro/rules.d/armel.mk
index 86545860fa8..438f0e71c8b 100644
--- a/debian.linaro/rules.d/armel.mk
+++ b/debian.linaro/rules.d/armel.mk
@@ -2,7 +2,7 @@ build_arch	= arm
 header_arch	= arm
 asm_link	= arm
 defconfig	= defconfig
-flavours	= linaro-mx51 linaro-omap linaro-vexpress
+flavours	=  linaro-mx51 linaro-omap linaro-u8500 linaro-vexpress
 build_image	= zImage
 kernel_file	= arch/$(build_arch)/boot/zImage
 install_file	= vmlinuz