LINARO: Linaro-2.6.37-1002.5 mx51 onlyLinaro-2.6.37-1002.5-mx51-only

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

7 files changed, 24 insertions, 1170 deletions

diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index 796ee8c1543c..ae0464771b47 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -1,4 +1,4 @@
-linux-linaro (2.6.37-1002.5) natty; urgency=low
+linux-linaro-mx51 (2.6.37-1002.5) natty; urgency=low
 
   [ John Rigby ]
 
@@ -10,7 +10,7 @@ linux-linaro (2.6.37-1002.5) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Sat, 08 Jan 2011 18:34:41 -0700
 
-linux-linaro (2.6.37-1001.4) natty; urgency=low
+linux-linaro-mx51 (2.6.37-1001.4) natty; urgency=low
 
   [ John Rigby ]
 
@@ -24,7 +24,7 @@ linux-linaro (2.6.37-1001.4) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Mon, 13 Dec 2010 16:51:19 -0700
 
-linux-linaro (2.6.37-1000.3) natty; urgency=low
+linux-linaro-mx51 (2.6.37-1000.3) natty; urgency=low
 
   [ John Rigby ]
 
@@ -34,7 +34,7 @@ linux-linaro (2.6.37-1000.3) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Wed, 01 Dec 2010 01:07:18 -0700
 
-linux-linaro (2.6.37-1000.2) natty; urgency=low
+linux-linaro-mx51 (2.6.37-1000.2) natty; urgency=low
 
   [ John Rigby ]
 
@@ -42,7 +42,7 @@ linux-linaro (2.6.37-1000.2) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 30 Nov 2010 01:00:49 -0700
 
-linux-linaro (2.6.37-1000.1) natty; urgency=low
+linux-linaro-mx51 (2.6.37-1000.1) natty; urgency=low
 
   [ John Rigby ]
 
@@ -62,7 +62,7 @@ linux-linaro (2.6.37-1000.1) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Fri, 26 Nov 2010 14:20:09 -0700
 
-linux-linaro (2.6.36-1000.1) natty; urgency=low
+linux-linaro-mx51 (2.6.36-1000.1) natty; urgency=low
 
   [ John Rigby ]
 
@@ -93,7 +93,7 @@ linux-linaro (2.6.36-1000.1) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Thu, 18 Nov 2010 15:23:03 -0700
 
-linux-linaro (2.6.35-1008.15) maverick-proposed; urgency=low
+linux-linaro-mx51 (2.6.35-1008.15) maverick-proposed; urgency=low
 
   [ Robert Nelson ]
 
@@ -102,7 +102,7 @@ linux-linaro (2.6.35-1008.15) maverick-proposed; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Thu, 21 Oct 2010 11:01:14 -0600
 
-linux-linaro (2.6.35-1008.14) maverick-proposed; urgency=low
+linux-linaro-mx51 (2.6.35-1008.14) maverick-proposed; urgency=low
 
   [ Andy Whitcroft ]
 
@@ -178,7 +178,7 @@ linux-linaro (2.6.35-1008.14) maverick-proposed; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 19 Oct 2010 16:09:52 -0600
 
-linux-linaro (2.6.35-1007.13) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1007.13) maverick; urgency=low
 
   [ Upstream Ubuntu ]
 
@@ -244,7 +244,7 @@ linux-linaro (2.6.35-1007.13) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Thu, 07 Oct 2010 17:58:05 -0600
 
-linux-linaro (2.6.35-1006.12) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1006.12) maverick; urgency=low
 
   [ John Rigby ]
 
@@ -257,7 +257,7 @@ linux-linaro (2.6.35-1006.12) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Mon, 20 Sep 2010 10:20:21 -0600
 
-linux-linaro (2.6.35-1006.11) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1006.11) maverick; urgency=low
 
   [ Upstream Kernel Changes ]
 
@@ -276,7 +276,7 @@ linux-linaro (2.6.35-1006.11) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Thu, 16 Sep 2010 18:03:14 -0600
 
-linux-linaro (2.6.35-1005.10) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1005.10) maverick; urgency=low
 
   [ Upstream Kernel Changes ]
 
@@ -292,7 +292,7 @@ linux-linaro (2.6.35-1005.10) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Wed, 08 Sep 2010 10:03:22 -0600
 
-linux-linaro (2.6.35-1004.9) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1004.9) maverick; urgency=low
 
   [ Upstream Kernel Changes ]
 
@@ -307,7 +307,7 @@ linux-linaro (2.6.35-1004.9) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Fri, 27 Aug 2010 20:27:29 -0600
 
-linux-linaro (2.6.35-1004.8) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1004.8) maverick; urgency=low
 
   [ John Rigby ]
 
@@ -315,7 +315,7 @@ linux-linaro (2.6.35-1004.8) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Wed, 25 Aug 2010 19:46:17 -0600
 
-linux-linaro (2.6.35-1003.7) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1003.7) maverick; urgency=low
 
   [ John Rigby ]
 
@@ -327,7 +327,7 @@ linux-linaro (2.6.35-1003.7) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Sun, 22 Aug 2010 21:29:44 -0600
 
-linux-linaro (2.6.35-1002.6) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1002.6) maverick; urgency=low
 
   [ Tim Gardner ]
 
@@ -341,7 +341,7 @@ linux-linaro (2.6.35-1002.6) maverick; urgency=low
 
  --  Tim Gardner <tim.gardner@canonical.com>  Tue, 17 Aug 2010 15:57:51 +0100
 
-linux-linaro (2.6.35-1001.5) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1001.5) maverick; urgency=low
 
   * New upstream trees
     
@@ -361,7 +361,7 @@ linux-linaro (2.6.35-1001.5) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Wed, 11 Aug 2010 14:20:28 -0600
 
-linux-linaro (2.6.35-1000.4) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1000.4) maverick; urgency=low
 
   [ John Rigby ]
 
@@ -370,7 +370,7 @@ linux-linaro (2.6.35-1000.4) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 10 Aug 2010 10:23:30 -0600
 
-linux-linaro (2.6.35-1000.3) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1000.3) maverick; urgency=low
 
   [ John Rigby ]
 
@@ -378,7 +378,7 @@ linux-linaro (2.6.35-1000.3) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 03 Aug 2010 10:16:29 -0600
 
-linux-linaro (2.6.35-1000.2) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1000.2) maverick; urgency=low
 
   [ John Rigby ]
 
@@ -386,7 +386,7 @@ linux-linaro (2.6.35-1000.2) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Wed, 28 Jul 2010 11:20:13 -0600
 
-linux-linaro (2.6.35-1000.1) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1000.1) maverick; urgency=low
 
   [ Linaro Kernel Changes ]
 
@@ -394,7 +394,7 @@ linux-linaro (2.6.35-1000.1) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 27 Jul 2010 17:17:39 -0600
 
-linux-linaro (2.6.35-1000.0) maverick; urgency=low
+linux-linaro-mx51 (2.6.35-1000.0) maverick; urgency=low
 
   [ John Rigby ]
 
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
deleted file mode 100644
index 656f754a104a..000000000000
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ /dev/null
@@ -1,568 +0,0 @@
-#
-# Config options for config.flavour.linaro-omap automatically generated by splitconfig.pl
-#
-CONFIG_AC97_BUS=m
-CONFIG_ADFS_FS=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_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_ATA=y
-CONFIG_ATALK=m
-CONFIG_ATA_OVER_ETH=m
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATM=m
-CONFIG_AUTOFS4_FS=m
-CONFIG_AUXDISPLAY=y
-CONFIG_AX88796=m
-CONFIG_B44=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BEFS_FS=m
-CONFIG_BFS_FS=m
-CONFIG_BINARY_PRINTF=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=m
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_BONDING=m
-CONFIG_BRIDGE=m
-CONFIG_BROADCOM_PHY=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BT=m
-CONFIG_C2PORT=m
-CONFIG_CAIF=m
-CONFIG_CAN=m
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CGROUPS=y
-CONFIG_CHR_DEV_OSST=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_CICADA_PHY=y
-CONFIG_CIFS=m
-CONFIG_CMDLINE=""
-CONFIG_CODA_FS=m
-CONFIG_CONFIGFS_FS=m
-CONFIG_CONNECTOR=y
-CONFIG_CPU_IDLE=y
-CONFIG_CRAMFS=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_LZO=m
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_VMAC=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_XTS=m
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_DAVICOM_PHY=y
-CONFIG_DCB=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_FS=y
-CONFIG_DECNET=m
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_DISPLAY_SUPPORT=y
-CONFIG_DLM=m
-CONFIG_DMADEVICES=y
-CONFIG_DNET=m
-CONFIG_EARLY_PRINTK=y
-CONFIG_ECONET=m
-CONFIG_EFS_FS=m
-# CONFIG_EMBEDDED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_EQUALIZER=m
-CONFIG_ETHOC=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_FAT_FS=m
-CONFIG_FB_ARMCLCD=m
-CONFIG_FB_BROADSHEET=m
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_MB862XX=m
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FIXED_PHY is not set
-CONFIG_FONTS=y
-CONFIG_FPE_NWFPE=y
-CONFIG_FREEZER=y
-CONFIG_FSCACHE=m
-CONFIG_FTL=m
-CONFIG_FTRACE=y
-CONFIG_FUSE_FS=y
-CONFIG_GAMEPORT=m
-CONFIG_GFS2_FS=m
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_BASIC_MMIO=y
-CONFIG_HAMRADIO=y
-CONFIG_HFSPLUS_FS=m
-CONFIG_HFS_FS=m
-CONFIG_HIDRAW=y
-CONFIG_HID_3M_PCT=m
-CONFIG_HID_CANDO=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_EGALAX=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_MOSART=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PID=y
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_QUANTA=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_ROCCAT_KONE=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_HID_STANTUM=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_TWINHAN=m
-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
-CONFIG_HZ=128
-CONFIG_I2C=y
-CONFIG_I2C_COMPAT=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_IEEE802154=m
-# CONFIG_IKCONFIG is not set
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_LRO=y
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INFTL=m
-CONFIG_INPUT_EVBUG=m
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_TABLET=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_IPC_NS=y
-CONFIG_IPX=m
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_DCCP=m
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_PNP is not set
-CONFIG_IP_SCTP=m
-CONFIG_ISDN=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_LZO=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KEXEC=y
-CONFIG_KEYBOARD_LKKBD=m
-CONFIG_KEYBOARD_NEWTON=m
-CONFIG_KEYBOARD_OPENCORES=m
-CONFIG_KEYBOARD_STOWAWAY=m
-CONFIG_KEYBOARD_SUNKBD=m
-CONFIG_KEYBOARD_XTKBD=m
-CONFIG_KEYS=y
-CONFIG_KGDB=y
-CONFIG_KPROBES=y
-CONFIG_KS8851_MLL=m
-CONFIG_L2TP=m
-CONFIG_LAPB=m
-CONFIG_LBDAF=y
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=0
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGITECH_FF=y
-# CONFIG_LOGO is not set
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_LSI_ET1011C_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_LZO_COMPRESS=m
-CONFIG_MACVLAN=m
-CONFIG_MARVELL_PHY=y
-CONFIG_MDIO_BITBANG=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MFD_SUPPORT=y
-CONFIG_MICREL_PHY=m
-CONFIG_MII=y
-CONFIG_MINIX_FS=m
-CONFIG_MISC_DEVICES=y
-CONFIG_MMC_ARMMMCI=m
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_MODVERSIONS=y
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MTD_ABSENT=m
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLOCK2MTD=m
-CONFIG_MTD_CFI=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_DOC2000=m
-CONFIG_MTD_DOC2001=m
-CONFIG_MTD_DOC2001PLUS=m
-CONFIG_MTD_GEN_PROBE=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTD_NAND=y
-CONFIG_MTD_ONENAND=m
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_PHYSMAP=m
-CONFIG_MTD_PLATRAM=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_TESTS=m
-CONFIG_MTD_UBI=m
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_NATIONAL_PHY=y
-CONFIG_NCP_FS=m
-CONFIG_NEON=y
-CONFIG_NETCONSOLE=m
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEV_10000=y
-CONFIG_NETFILTER=y
-CONFIG_NETPOLL=y
-CONFIG_NET_9P=m
-CONFIG_NET_DSA=y
-CONFIG_NET_IPIP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_NS=y
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NET_SCHED=y
-CONFIG_NFSD=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_NFTL=m
-CONFIG_NILFS2_FS=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_DEFAULT="cp437"
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_NO_HZ=y
-CONFIG_NTFS_FS=m
-CONFIG_OABI_COMPAT=y
-CONFIG_OCFS2_FS=m
-CONFIG_OC_ETM=y
-CONFIG_OMFS_FS=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_PERF_COUNTERS=y
-CONFIG_PHONE=m
-CONFIG_PHONET=m
-CONFIG_PID_NS=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_POWER_SUPPLY=y
-CONFIG_PPS=m
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PRINTK_TIME=y
-CONFIG_PRINT_QUOTA_WARNING=y
-CONFIG_PROFILING=y
-CONFIG_QNX4FS_FS=m
-CONFIG_QSEMI_PHY=y
-CONFIG_QUOTA=y
-CONFIG_QUOTACTL=y
-CONFIG_RAID_ATTRS=m
-CONFIG_RAMOOPS=m
-CONFIG_RAW_DRIVER=m
-CONFIG_RDS=m
-CONFIG_REALTEK_PHY=y
-CONFIG_REGULATOR=y
-CONFIG_REISERFS_FS=m
-CONFIG_RELAY=y
-CONFIG_RFD_FTL=m
-CONFIG_RFKILL=m
-CONFIG_ROMFS_FS=m
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_CMOS=m
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_PL030=m
-CONFIG_RTC_DRV_PL031=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_TEST=m
-CONFIG_RTC_DRV_V3020=m
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SATA_PMP=y
-CONFIG_SCHEDSTATS=y
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_DH=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SDIO_UART=m
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_AMBA_PL011=m
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_SERIAL_TIMBERDALE=m
-CONFIG_SERIO_ALTERA_PS2=m
-# CONFIG_SERIO_AMBAKMI is not set
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_SERPORT=m
-CONFIG_SLIP=y
-CONFIG_SLUB_DEBUG=y
-CONFIG_SMC911X=m
-CONFIG_SMC91X=m
-CONFIG_SMSC911X=y
-CONFIG_SMSC_PHY=y
-CONFIG_SM_FTL=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_ARMAACI=m
-CONFIG_SND_DRIVERS=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM=y
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_SOC=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SPI=y
-CONFIG_SSFDC=m
-CONFIG_STAGING=y
-CONFIG_STANDALONE=y
-CONFIG_STE10XP=y
-# CONFIG_SWP_EMULATE is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_SYSV_FS=m
-CONFIG_TASKSTATS=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_MD5SIG=y
-CONFIG_THERMAL=m
-CONFIG_TIMER_STATS=y
-CONFIG_TIPC=m
-CONFIG_TUN=m
-CONFIG_UDF_FS=m
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_UFS_FS=m
-CONFIG_UIO=m
-CONFIG_UNUSED_SYMBOLS=y
-CONFIG_USB_ACM=m
-CONFIG_USB_ADUTUX=m
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_CATC=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_EMI26=m
-CONFIG_USB_EMI62=m
-CONFIG_USB_GADGET=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_HWA_HCD=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1760_HCD=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LD=m
-CONFIG_USB_LED=m
-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
-CONFIG_USB_PRINTER=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_STORAGE=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_TEST=m
-CONFIG_USB_TMC=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_UAS=m
-CONFIG_USB_ULPI=y
-CONFIG_USB_WDM=m
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-CONFIG_USER_NS=y
-CONFIG_UTS_NS=y
-CONFIG_VETH=m
-CONFIG_VFAT_FS=m
-CONFIG_VITESSE_PHY=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_VXFS_FS=m
-CONFIG_W1=m
-CONFIG_WAN=y
-CONFIG_WAN_ROUTER=m
-CONFIG_WATCHDOG=y
-CONFIG_WIMAX=m
-CONFIG_WIRELESS=y
-CONFIG_WLAN=y
-CONFIG_X25=m
-CONFIG_XFRM_USER=m
-CONFIG_XFS_FS=m
-CONFIG_ZLIB_DEFLATE=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
deleted file mode 100644
index 8ba6597e9955..000000000000
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ /dev/null
@@ -1,560 +0,0 @@
-#
-# Config options for config.flavour.linaro-vexpress automatically generated by splitconfig.pl
-#
-CONFIG_AC97_BUS=y
-# CONFIG_ADFS_FS 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_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
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATM is not set
-# CONFIG_AUTOFS4_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_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 is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BONDING is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_BT is not set
-# CONFIG_C2PORT 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 is not set
-# CONFIG_CIFS is not set
-CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M"
-# CONFIG_CODA_FS is not set
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-# CONFIG_CPU_IDLE is not set
-CONFIG_CRAMFS=y
-CONFIG_CRC_T10DIF=m
-CONFIG_CRYPTO_AEAD2=m
-CONFIG_CRYPTO_ALGAPI=m
-CONFIG_CRYPTO_ALGAPI2=m
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER2=m
-# 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=m
-# 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=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_ECB=m
-# 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=m
-CONFIG_CRYPTO_HASH2=m
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_MANAGER2=m
-# CONFIG_CRYPTO_MD4 is not set
-CONFIG_CRYPTO_MD5=m
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP2=m
-# 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=m
-# 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=m
-# 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 is not set
-# CONFIG_DCB is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DECNET is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
-# 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 is not set
-# CONFIG_ECONET is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_ETHOC is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4_FS_XATTR is not set
-CONFIG_FAT_FS=y
-CONFIG_FB_ARMCLCD=y
-# CONFIG_FB_BROADSHEET is not set
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FIXED_PHY is not set
-# CONFIG_FONTS is not set
-# CONFIG_FPE_NWFPE is not set
-# CONFIG_FREEZER is not set
-# CONFIG_FSCACHE is not set
-# CONFIG_FTL is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_GAMEPORT is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_GPIOLIB 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=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
-CONFIG_HZ=100
-# CONFIG_I2C is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_IEEE802154 is not set
-CONFIG_IKCONFIG=y
-# 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=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INFTL is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_IOSCHED_CFQ is not set
-# 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_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_LZO is not set
-# CONFIG_KALLSYMS_ALL is not set
-# 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 is not set
-# 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=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=16
-# CONFIG_LOGIG940_FF is not set
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGITECH_FF is not set
-CONFIG_LOGO=y
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LXT_PHY is not set
-CONFIG_LZO_COMPRESS=m
-# CONFIG_MACVLAN is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_MFD_SUPPORT is not set
-# CONFIG_MICREL_PHY is not set
-CONFIG_MII=y
-# CONFIG_MINIX_FS is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_MMC_ARMMMCI=y
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_BCM5974 is not set
-CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-# 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_ARM_INTEGRATOR=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_CONCAT=y
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# 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_PHYSMAP 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 is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NEON is not set
-# 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 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NILFS2_FS is not set
-# CONFIG_NLS_ASCII is not set
-# 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="iso8859-1"
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# 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 is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NTFS_FS is not set
-CONFIG_OABI_COMPAT=y
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OC_ETM is not set
-# CONFIG_OMFS_FS 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 is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_PPS is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PRINTK_TIME is not set
-# CONFIG_PROFILING is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QUOTA is not set
-# CONFIG_QUOTACTL is not set
-# 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 is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_RELAY is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# 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 is not set
-# CONFIG_SATA_AHCI_PLATFORM is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DH is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_MULTI_LUN is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# 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=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SLIP is not set
-CONFIG_SLUB_DEBUG=y
-CONFIG_SMC911X=y
-# CONFIG_SMC91X is not set
-CONFIG_SMSC911X=y
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SM_FTL is not set
-CONFIG_SND_AC97_CODEC=y
-CONFIG_SND_ARMAACI=y
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM=y
-CONFIG_SND_PCM_OSS=y
-# CONFIG_SND_SOC is not set
-CONFIG_SND_TIMER=y
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-CONFIG_SOUND_OSS_CORE=y
-# CONFIG_SPI is not set
-# CONFIG_SSFDC is not set
-# CONFIG_STAGING is not set
-CONFIG_STANDALONE=y
-# CONFIG_STE10XP is not set
-CONFIG_SWP_EMULATE=y
-# 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_TUN is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# 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=y
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# 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_ISIGHTFW is not set
-# CONFIG_USB_ISP116X_HCD is not set
-CONFIG_USB_ISP1760_HCD=y
-# 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=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
-# 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=m
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TMC is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UAS is not set
-# 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 is not set
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# 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=y
-CONFIG_WLAN=y
-# 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/control.d/vars.linaro-omap b/debian.linaro/control.d/vars.linaro-omap
deleted file mode 100644
index 33e2d5c63049..000000000000
--- a/debian.linaro/control.d/vars.linaro-omap
+++ /dev/null
@@ -1,8 +0,0 @@
-arch="armel"
-supported="TI OMAP3"
-desc="TI OMAP3-based systems"
-target="Targeted towards boards such as Beagleboard, Gumstix, IGEPv2, etc."
-bootloader="uboot-mkimage, flash-kernel"
-provides=""
-section_image="universe/base"
-do_debug="Yes"
diff --git a/debian.linaro/control.d/vars.linaro-vexpress b/debian.linaro/control.d/vars.linaro-vexpress
deleted file mode 100644
index cce249ebe7a6..000000000000
--- a/debian.linaro/control.d/vars.linaro-vexpress
+++ /dev/null
@@ -1,8 +0,0 @@
-arch="armel"
-supported="ARM Versatile Express"
-desc="ARM Versatile Express with CortexA9x4 tile"
-target="CA9x4"
-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 ac3ae2537864..6e62a55b3106 100644
--- a/debian.linaro/d-i/kernel-versions.in
+++ b/debian.linaro/d-i/kernel-versions.in
@@ -1,6 +1,4 @@
 # arch	version		flavour		installedname			suffix	bdep
 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	-
 # Ports
 # arch	version		flavour		installedname			suffix	bdep
diff --git a/debian.linaro/rules.d/armel.mk b/debian.linaro/rules.d/armel.mk
index 86545860fa8a..615211fed876 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  
 build_image	= zImage
 kernel_file	= arch/$(build_arch)/boot/zImage
 install_file	= vmlinuz
@@ -13,4 +13,4 @@ do_doc_package	= false
 do_source_package	= false
 do_common_headers_indep = false
 do_libc_dev_package	= false
-do_tools		= true
+do_tools = true