aboutsummaryrefslogtreecommitdiff
path: root/debian.linaro
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-11-21 10:29:56 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-21 10:29:56 -0700
commit382085d83f792a78fe5354f8e11d4b4eb928704b (patch)
tree9d82f86608c8d7db37e8ea49b055eaa9a6026c3e /debian.linaro
parent7a9226570ec26ce856aa62f1f33c37aaba92de6c (diff)
LINARO: Linaro-3.1.0-4.4 shared onlyLinaro-3.1.0-4.4-shared-only
Signed-off-by: John Rigby <john.rigby@linaro.org>
Diffstat (limited to 'debian.linaro')
-rw-r--r--debian.linaro/changelog94
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-mx5142
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-omap50
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-vexpress49
-rw-r--r--debian.linaro/control.d/vars.linaro-mx518
-rw-r--r--debian.linaro/control.d/vars.linaro-omap8
-rw-r--r--debian.linaro/control.d/vars.linaro-vexpress8
-rw-r--r--debian.linaro/d-i/kernel-versions.in3
-rw-r--r--debian.linaro/rules.d/armel.mk4
9 files changed, 49 insertions, 217 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index a94a6b40bc2..94920ed292b 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -1,4 +1,4 @@
-linux-linaro (3.1.0-4.4) oneiric; urgency=low
+linux-linaro-shared (3.1.0-4.4) oneiric; urgency=low
[ Dave Martin ]
@@ -12,7 +12,7 @@ linux-linaro (3.1.0-4.4) oneiric; urgency=low
-- John Rigby <john.rigby@linaro.org> Mon, 21 Nov 2011 08:48:45 -0700
-linux-linaro (3.1.0-3.3) precise; urgency=low
+linux-linaro-shared (3.1.0-3.3) precise; urgency=low
* rebase on new ubuntu:
commit 6f36ca1e3af7296ddd58504abd6772e8e374bf03
@@ -26,7 +26,7 @@ linux-linaro (3.1.0-3.3) precise; urgency=low
-- John Rigby <john.rigby@linaro.org> Wed, 16 Nov 2011 16:05:04 -0700
-linux-linaro (3.1.0-2.2) precise; urgency=low
+linux-linaro-shared (3.1.0-2.2) precise; urgency=low
[ John Rigby ]
@@ -36,7 +36,7 @@ linux-linaro (3.1.0-2.2) precise; urgency=low
-- John Rigby <john.rigby@linaro.org> Thu, 20 Oct 2011 22:01:36 -0600
-linux-linaro (3.1.0-1.1) oneiric; urgency=low
+linux-linaro-shared (3.1.0-1.1) oneiric; urgency=low
[ John Rigby ]
@@ -60,7 +60,7 @@ linux-linaro (3.1.0-1.1) oneiric; urgency=low
-- John Rigby <john.rigby@linaro.org> Mon, 17 Oct 2011 12:31:38 -0600
-linux-linaro (3.1.0-1.0) precise; urgency=low
+linux-linaro-shared (3.1.0-1.0) precise; urgency=low
[ John Rigby ]
@@ -68,7 +68,7 @@ linux-linaro (3.1.0-1.0) precise; urgency=low
-- John Rigby <john.rigby@linaro.org> Wed, 12 Oct 2011 17:30:15 -0600
-linux-linaro (3.0.0-1007.11) natty; urgency=low
+linux-linaro-shared (3.0.0-1007.11) natty; urgency=low
[ John Rigby ]
@@ -78,7 +78,7 @@ linux-linaro (3.0.0-1007.11) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Tue, 27 Sep 2011 13:23:11 -0600
-linux-linaro (3.0.0-1007.10) natty; urgency=low
+linux-linaro-shared (3.0.0-1007.10) natty; urgency=low
[ John Rigby ]
@@ -86,7 +86,7 @@ linux-linaro (3.0.0-1007.10) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Mon, 26 Sep 2011 18:57:19 -0600
-linux-linaro (3.0.0-1007.9) oneiric; urgency=low
+linux-linaro-shared (3.0.0-1007.9) oneiric; urgency=low
[ John Rigby ]
@@ -96,7 +96,7 @@ linux-linaro (3.0.0-1007.9) oneiric; urgency=low
-- John Rigby <john.rigby@linaro.org> Mon, 26 Sep 2011 10:44:23 -0600
-linux-linaro (3.0.0-1006.8) natty; urgency=low
+linux-linaro-shared (3.0.0-1006.8) natty; urgency=low
[ John Rigby ]
@@ -108,7 +108,7 @@ linux-linaro (3.0.0-1006.8) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Fri, 23 Sep 2011 20:33:58 -0600
-linux-linaro (3.0.0-1005.7) natty; urgency=low
+linux-linaro-shared (3.0.0-1005.7) natty; urgency=low
[ John Rigby ]
@@ -128,7 +128,7 @@ linux-linaro (3.0.0-1005.7) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Mon, 12 Sep 2011 13:36:56 -0600
-linux-linaro (3.0.0-1004.6) natty; urgency=low
+linux-linaro-shared (3.0.0-1004.6) natty; urgency=low
[ John Rigby ]
@@ -137,7 +137,7 @@ linux-linaro (3.0.0-1004.6) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Wed, 24 Aug 2011 09:36:17 -0600
-linux-linaro (3.0.0-1004.5) natty; urgency=low
+linux-linaro-shared (3.0.0-1004.5) natty; urgency=low
[ John Rigby ]
@@ -150,7 +150,7 @@ linux-linaro (3.0.0-1004.5) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Sun, 21 Aug 2011 22:20:20 -0600
-linux-linaro (3.0.0-1003.4) natty; urgency=low
+linux-linaro-shared (3.0.0-1003.4) natty; urgency=low
[ John Rigby ]
* LINARO: CONFIG: Enable basic profiling and tracing options
@@ -160,7 +160,7 @@ linux-linaro (3.0.0-1003.4) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Mon, 08 Aug 2011 12:15:28 -0600
-linux-linaro (3.0.0-1002.3) natty; urgency=low
+linux-linaro-shared (3.0.0-1002.3) natty; urgency=low
[ John Rigby ]
@@ -169,7 +169,7 @@ linux-linaro (3.0.0-1002.3) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Thu, 28 Jul 2011 17:05:03 -0600
-linux-linaro (3.0.0-1002.2) natty; urgency=low
+linux-linaro-shared (3.0.0-1002.2) natty; urgency=low
[ Ricardo Salveti ]
@@ -179,7 +179,7 @@ linux-linaro (3.0.0-1002.2) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Thu, 28 Jul 2011 10:58:12 -0600
-linux-linaro (3.0.0-1001.1) natty; urgency=low
+linux-linaro-shared (3.0.0-1001.1) natty; urgency=low
[ John Rigby ]
@@ -193,7 +193,7 @@ linux-linaro (3.0.0-1001.1) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Mon, 25 Jul 2011 14:58:08 -0600
-linux-linaro (3.0.0-1000.0) natty; urgency=low
+linux-linaro-shared (3.0.0-1000.0) natty; urgency=low
[ John Rigby ]
@@ -205,7 +205,7 @@ linux-linaro (3.0.0-1000.0) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Fri, 22 Jul 2011 00:11:56 -0600
-linux-linaro (2.6.39-1001.2) oneiric; urgency=low
+linux-linaro-shared (2.6.39-1001.2) oneiric; urgency=low
[ John Rigby ]
@@ -218,7 +218,7 @@ linux-linaro (2.6.39-1001.2) oneiric; urgency=low
-- John Rigby <john.rigby@linaro.org> Sun, 26 Jun 2011 18:47:45 +0100
-linux-linaro (2.6.39-1000.1) oneiric; urgency=low
+linux-linaro-shared (2.6.39-1000.1) oneiric; urgency=low
[ John Rigby ]
@@ -226,7 +226,7 @@ linux-linaro (2.6.39-1000.1) oneiric; urgency=low
-- John Rigby <john.rigby@linaro.org> Wed, 22 Jun 2011 07:22:49 -0600
-linux-linaro (2.6.39-1000.0) oneiric; urgency=low
+linux-linaro-shared (2.6.39-1000.0) oneiric; urgency=low
[ John Rigby ]
@@ -239,7 +239,7 @@ linux-linaro (2.6.39-1000.0) oneiric; urgency=low
-- John Rigby <john.rigby@linaro.org> Tue, 21 Jun 2011 13:45:49 -0600
-linux-linaro (2.6.38-1003.4) natty; urgency=low
+linux-linaro-shared (2.6.38-1003.4) natty; urgency=low
[ Avik Sil ]
@@ -320,7 +320,7 @@ linux-linaro (2.6.38-1003.4) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Fri, 27 May 2011 18:53:05 -0600
-linux-linaro (2.6.38-1002.3) natty; urgency=low
+linux-linaro-shared (2.6.38-1002.3) natty; urgency=low
[ Upstream Fixes ]
@@ -355,7 +355,7 @@ linux-linaro (2.6.38-1002.3) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Thu, 14 Apr 2011 12:16:06 -0600
-linux-linaro (2.6.38-1001.2) natty; urgency=low
+linux-linaro-shared (2.6.38-1001.2) natty; urgency=low
[ John Rigby ]
@@ -398,7 +398,7 @@ linux-linaro (2.6.38-1001.2) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Fri, 18 Mar 2011 07:36:33 -0600
-linux-linaro (2.6.38-1000.1) natty; urgency=low
+linux-linaro-shared (2.6.38-1000.1) natty; urgency=low
* Rebase to new upstreams:
Linux v2.6.38-rc5
@@ -417,7 +417,7 @@ linux-linaro (2.6.38-1000.1) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Wed, 23 Feb 2011 16:57:41 -0700
-linux-linaro (2.6.37-1003.6) natty; urgency=low
+linux-linaro-shared (2.6.37-1003.6) natty; urgency=low
[ John Rigby ]
@@ -448,7 +448,7 @@ linux-linaro (2.6.37-1003.6) natty; urgency=low
-- John Rigby <john.rigby@linaro.org> Tue, 08 Feb 2011 19:56:22 -0700
-linux-linaro (2.6.37-1002.5) natty; urgency=low
+linux-linaro-shared (2.6.37-1002.5) natty; urgency=low
[ John Rigby ]
@@ -460,7 +460,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-shared (2.6.37-1001.4) natty; urgency=low
[ John Rigby ]
@@ -474,7 +474,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-shared (2.6.37-1000.3) natty; urgency=low
[ John Rigby ]
@@ -484,7 +484,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-shared (2.6.37-1000.2) natty; urgency=low
[ John Rigby ]
@@ -492,7 +492,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-shared (2.6.37-1000.1) natty; urgency=low
[ John Rigby ]
@@ -512,7 +512,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-shared (2.6.36-1000.1) natty; urgency=low
[ John Rigby ]
@@ -543,7 +543,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-shared (2.6.35-1008.15) maverick-proposed; urgency=low
[ Robert Nelson ]
@@ -552,7 +552,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-shared (2.6.35-1008.14) maverick-proposed; urgency=low
[ Andy Whitcroft ]
@@ -628,7 +628,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-shared (2.6.35-1007.13) maverick; urgency=low
[ Upstream Ubuntu ]
@@ -694,7 +694,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-shared (2.6.35-1006.12) maverick; urgency=low
[ John Rigby ]
@@ -707,7 +707,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-shared (2.6.35-1006.11) maverick; urgency=low
[ Upstream Kernel Changes ]
@@ -726,7 +726,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-shared (2.6.35-1005.10) maverick; urgency=low
[ Upstream Kernel Changes ]
@@ -742,7 +742,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-shared (2.6.35-1004.9) maverick; urgency=low
[ Upstream Kernel Changes ]
@@ -757,7 +757,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-shared (2.6.35-1004.8) maverick; urgency=low
[ John Rigby ]
@@ -765,7 +765,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-shared (2.6.35-1003.7) maverick; urgency=low
[ John Rigby ]
@@ -777,7 +777,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-shared (2.6.35-1002.6) maverick; urgency=low
[ Tim Gardner ]
@@ -791,7 +791,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-shared (2.6.35-1001.5) maverick; urgency=low
* New upstream trees
@@ -811,7 +811,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-shared (2.6.35-1000.4) maverick; urgency=low
[ John Rigby ]
@@ -820,7 +820,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-shared (2.6.35-1000.3) maverick; urgency=low
[ John Rigby ]
@@ -828,7 +828,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-shared (2.6.35-1000.2) maverick; urgency=low
[ John Rigby ]
@@ -836,7 +836,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-shared (2.6.35-1000.1) maverick; urgency=low
[ Linaro Kernel Changes ]
@@ -844,7 +844,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-shared (2.6.35-1000.0) maverick; urgency=low
[ John Rigby ]
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
deleted file mode 100644
index 57bc8399f8a..00000000000
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Config options for config.flavour.linaro-mx51 automatically generated by splitconfig.pl
-#
-CONFIG_AC97_BUS=m
-CONFIG_ARCH_MXC=y
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VEXPRESS is not set
-CONFIG_ARM_L1_CACHE_SHIFT=6
-CONFIG_ARM_THUMBEE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_CMDLINE=""
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DRM is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FONTS is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_GPIOLIB=y
-CONFIG_HZ=100
-CONFIG_MAC80211_RC_DEFAULT="pid"
-# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
-CONFIG_MAC80211_RC_DEFAULT_PID=y
-# CONFIG_MFD_CORE is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_SND=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_ARMAACI=m
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_PCM=m
-CONFIG_SND_TIMER=m
-# CONFIG_TWL4030_CORE is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_OTG is not set
-CONFIG_W1=y
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 3b9015de1d1..00000000000
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Config options for config.flavour.linaro-omap automatically generated by splitconfig.pl
-#
-CONFIG_AC97_BUS=m
-# CONFIG_ARCH_MXC is not set
-CONFIG_ARCH_OMAP=y
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARM_ERRATA_751472 is not set
-# CONFIG_ARM_ERRATA_753970 is not set
-CONFIG_ARM_L1_CACHE_SHIFT=5
-CONFIG_ARM_THUMBEE=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
-CONFIG_DISPLAY_SUPPORT=y
-CONFIG_DRM=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FONTS=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_GPIOLIB=y
-CONFIG_HZ=128
-CONFIG_MAC80211_RC_DEFAULT="pid"
-# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
-CONFIG_MAC80211_RC_DEFAULT_PID=y
-CONFIG_MFD_CORE=y
-CONFIG_MFD_TWL4030_AUDIO=y
-CONFIG_MMC_UNSAFE_RESUME=y
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-# CONFIG_MUSB_PIO_ONLY is not set
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_NR_CPUS=2
-CONFIG_PL310_ERRATA_588369=y
-CONFIG_PL310_ERRATA_727915=y
-CONFIG_SND=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_ARMAACI=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_PCM=m
-CONFIG_SND_TIMER=m
-CONFIG_TWL4030_CORE=y
-CONFIG_TWL6040_CORE=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-CONFIG_USB_GADGET=y
-# CONFIG_USB_ISP1760_HCD is not set
-CONFIG_USB_OTG=y
-CONFIG_W1=y
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 f5b897e01e5..00000000000
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Config options for config.flavour.linaro-vexpress automatically generated by splitconfig.pl
-#
-CONFIG_AC97_BUS=y
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_OMAP is not set
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARM_ERRATA_751472=y
-CONFIG_ARM_ERRATA_753970=y
-CONFIG_ARM_L1_CACHE_SHIFT=5
-# CONFIG_ARM_THUMBEE is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M"
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DRM is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FONTS is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_GPIOLIB is not set
-CONFIG_HZ=100
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_TWL4030_AUDIO is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MTD_ARM_INTEGRATOR=y
-CONFIG_MUSB_PIO_ONLY=y
-# CONFIG_NOP_USB_XCEIV is not set
-CONFIG_NR_CPUS=4
-# CONFIG_PL310_ERRATA_588369 is not set
-# CONFIG_PL310_ERRATA_727915 is not set
-CONFIG_SND=y
-CONFIG_SND_AC97_CODEC=y
-CONFIG_SND_ARMAACI=y
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_PCM=y
-CONFIG_SND_TIMER=y
-CONFIG_TWL4030_CORE=y
-# CONFIG_TWL6040_CORE is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-CONFIG_USB_GADGET=y
-CONFIG_USB_ISP1760_HCD=y
-CONFIG_USB_OTG=y
-# CONFIG_W1 is not set
diff --git a/debian.linaro/control.d/vars.linaro-mx51 b/debian.linaro/control.d/vars.linaro-mx51
deleted file mode 100644
index d48c7e1b292..00000000000
--- a/debian.linaro/control.d/vars.linaro-mx51
+++ /dev/null
@@ -1,8 +0,0 @@
-arch="armel"
-supported="Freescale i.MX51"
-desc="Freescale i.MX51 based platforms"
-target="Freescale Babbage platform"
-bootloader="uboot-mkimage, flash-kernel"
-provides=""
-section_image="universe/base"
-do_debug="Yes"
diff --git a/debian.linaro/control.d/vars.linaro-omap b/debian.linaro/control.d/vars.linaro-omap
deleted file mode 100644
index a7f41642ba2..00000000000
--- a/debian.linaro/control.d/vars.linaro-omap
+++ /dev/null
@@ -1,8 +0,0 @@
-arch="armel"
-supported="TI OMAP[34]"
-desc="TI OMAP[34]-based systems"
-target="Targeted towards boards such as Beagleboard, PandaBoard, 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 cce249ebe7a..00000000000
--- 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 247c1eaee8c..6bc7e8ff281 100644
--- a/debian.linaro/d-i/kernel-versions.in
+++ b/debian.linaro/d-i/kernel-versions.in
@@ -1,8 +1,5 @@
# 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-s5pv310 PKGVER-ABINUM-linaro-s5pv310 -
#armel PKGVER-ABINUM linaro-u8500 PKGVER-ABINUM-linaro-u8500 -
-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 b7760b3c2aa..438417f03f3 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 =
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