2 files changed, 2 insertions, 21 deletions
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 5154da6aea5..2382cdb11ee 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -2,21 +2,14 @@
 # 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_L1_CACHE_SHIFT=5
 CONFIG_ARM_THUMBEE=y
 # CONFIG_AUTO_ZRELADDR is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
-CONFIG_DEBUG_LL_UART_NONE=y
-CONFIG_DISPLAY_SUPPORT=y
 CONFIG_DRM=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FIRMWARE_EDID=y
@@ -43,12 +36,9 @@ 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_USB_MUSB_TUSB6010 is not set
 CONFIG_W1=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index da64ec72473..38ad147e0b6 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -2,21 +2,14 @@
 # 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_L1_CACHE_SHIFT=5
 # CONFIG_ARM_THUMBEE is not set
 CONFIG_AUTO_ZRELADDR=y
 # 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_DEBUG_LL_UART_NONE=y
-# CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_DRM is not set
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FIRMWARE_EDID is not set
@@ -43,11 +36,9 @@ 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_USB_MUSB_TUSB6010=y
 # CONFIG_W1 is not set