aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-08-31 19:06:55 -0600
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 15:01:31 -0700
commitc18e2a1dcfde8139dab2de490c7e9779a480ddbe (patch)
tree43270f5270ef8c9880c2465b193a0a4315bba0dd
parent5fe726d4f3c3a747d0dc0e17ae974c74fe17887b (diff)
downloadlinux-linaro-precise-c18e2a1dcfde8139dab2de490c7e9779a480ddbe.tar.gz
LINARO: CONFIG: Remove unsupported flavours
Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-s5pv310228
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-u8500227
-rw-r--r--debian.linaro/config/enforce4
-rw-r--r--debian.linaro/control.d/vars.linaro-s5pv3108
-rw-r--r--debian.linaro/control.d/vars.linaro-u85008
-rw-r--r--debian.linaro/d-i/kernel-versions.in4
-rw-r--r--debian.linaro/rules.d/armel.mk2
7 files changed, 3 insertions, 478 deletions
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
deleted file mode 100644
index 3632f91a617..00000000000
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ /dev/null
@@ -1,228 +0,0 @@
-#
-# Config options for config.flavour.linaro-s5pv310 automatically generated by splitconfig.pl
-#
-CONFIG_ARCH_EXYNOS4=y
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_OMAP is not set
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-# CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARM_ERRATA_720789 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 is not set
-# CONFIG_ATA is not set
-# CONFIG_AUTOFS4_FS is not set
-CONFIG_AVERAGE=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_BINFMT_MISC is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_BT is not set
-# CONFIG_CAIF is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_CGROUPS is not set
-CONFIG_CHR_DEV_SG=y
-CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-# CONFIG_CPU_FREQ is not set
-CONFIG_CRAMFS=y
-# CONFIG_CRC7 is not set
-CONFIG_CRC_CCITT=y
-# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_ARC4=m
-# CONFIG_CRYPTO_DEFLATE is not set
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_MANAGER2=y
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_LL=y
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_PREEMPT=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-CONFIG_DEBUG_USER=y
-CONFIG_DEFAULT_IOSCHED="cfq"
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_DRM is not set
-# CONFIG_EXPERT is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_IMAGEBLIT 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_FUNCTION_TRACER is not set
-# CONFIG_FUSE_FS is not set
-CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
-# CONFIG_HAVE_ARCH_PFN_VALID is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_HWMON is not set
-CONFIG_HW_RANDOM=y
-CONFIG_HZ=200
-CONFIG_I2C=y
-# CONFIG_I2C_CHARDEV is not set
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_HELPER_AUTO=y
-# CONFIG_IKCONFIG is not set
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-# CONFIG_INLINE_READ_UNLOCK is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_ISO9660_FS is not set
-CONFIG_KALLSYMS_ALL=y
-# CONFIG_KEXEC is not set
-# CONFIG_KEYS is not set
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-# CONFIG_MFD_SUPPORT is not set
-# CONFIG_MISC_DEVICES is not set
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_MMC is not set
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODVERSIONS is not set
-CONFIG_MSDOS_FS=y
-# CONFIG_MTD is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_NAMESPACES=y
-# CONFIG_NETDEVICES is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_NET_KEY is not set
-CONFIG_NET_NS=y
-# CONFIG_NEW_LEDS is not set
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_NOP_USB_XCEIV is not set
-CONFIG_NO_HZ=y
-CONFIG_NR_CPUS=2
-# CONFIG_OC_ETM is not set
-# CONFIG_PACKET is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PHONET is not set
-CONFIG_PID_NS=y
-# CONFIG_PL310_ERRATA_588369 is not set
-# CONFIG_PL310_ERRATA_727915 is not set
-# CONFIG_PM_RUNTIME is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY is not set
-CONFIG_PREEMPT=y
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_RCU=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_QUOTA is not set
-# CONFIG_QUOTACTL is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_RELAY is not set
-CONFIG_ROMFS_FS=y
-# CONFIG_RTC_CLASS is not set
-# CONFIG_SCHEDSTATS is not set
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCSI=y
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_MULTI_LUN is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_CONSOLE is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_DEBUG=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_SOUND is not set
-# CONFIG_SPI is not set
-CONFIG_SPLIT_PTLOCK_CPUS=999999
-# CONFIG_STAGING is not set
-CONFIG_STANDALONE=y
-CONFIG_SWAP=y
-CONFIG_SWP_EMULATE=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-# CONFIG_SYSVIPC is not set
-# CONFIG_TOUCHSCREEN_BU21013 is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UNIX is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_DEBUG is not set
-CONFIG_USB_DEVICE_CLASS=y
-# CONFIG_USB_EHCI_HCD is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_STORAGE is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_WDM is not set
-CONFIG_USER_NS=y
-CONFIG_UTS_NS=y
-# CONFIG_VMSPLIT_2G is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_W1 is not set
-# CONFIG_WATCHDOG is not set
-CONFIG_WIRELESS=y
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_ZBOOT_ROM_TEXT=0
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
deleted file mode 100644
index b66d10e8160..00000000000
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ /dev/null
@@ -1,227 +0,0 @@
-#
-# Config options for config.flavour.linaro-u8500 automatically generated by splitconfig.pl
-#
-CONFIG_ABX500_CORE=y
-# CONFIG_ARCH_EXYNOS4 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-CONFIG_ARCH_U8500=y
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARM_ERRATA_720789 is not set
-# CONFIG_ARM_ERRATA_751472 is not set
-CONFIG_ARM_ERRATA_753970=y
-CONFIG_ARM_L1_CACHE_SHIFT=5
-# CONFIG_ARM_THUMBEE is not set
-# CONFIG_ATA is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AVERAGE is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_BT is not set
-CONFIG_CAIF=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_CGROUPS is not set
-CONFIG_CMDLINE="root=/dev/ram0 console=ttyAMA2,115200n8"
-CONFIG_CONFIGFS_FS=m
-# CONFIG_CONNECTOR is not set
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_CPU_FREQ=y
-# CONFIG_CRC7 is not set
-CONFIG_CRC_CCITT=y
-# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC_T10DIF is not set
-# CONFIG_CRYPTO_AES is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_ECB is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-CONFIG_DEBUG_USER=y
-CONFIG_DEFAULT_IOSCHED="cfq"
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_DISPLAY_SUPPORT is not set
-CONFIG_DMADEVICES=y
-# CONFIG_DRM is not set
-# CONFIG_EXPERT is not set
-CONFIG_EXT2_FS_XATTR=y
-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
-# CONFIG_FONTS is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FUNCTION_TRACER=y
-# CONFIG_FUSE_FS is not set
-CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
-CONFIG_HAVE_ARCH_PFN_VALID=y
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_HWMON is not set
-CONFIG_HW_RANDOM=y
-CONFIG_HZ=100
-CONFIG_I2C=y
-# CONFIG_I2C_CHARDEV is not set
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_HELPER_AUTO=y
-# CONFIG_IKCONFIG is not set
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-# CONFIG_INLINE_READ_UNLOCK is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IPC_NS=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_ISO9660_FS is not set
-CONFIG_KALLSYMS_ALL=y
-# CONFIG_KEXEC is not set
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYS is not set
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LEDS_LP5521=y
-# CONFIG_LEDS_TRIGGERS is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_MFD_CORE=y
-CONFIG_MFD_STMPE=y
-CONFIG_MFD_SUPPORT=y
-CONFIG_MFD_TC3589X=y
-CONFIG_MISC_DEVICES=y
-# CONFIG_MISC_FILESYSTEMS is not set
-CONFIG_MMC=y
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MSDOS_FS is not set
-# CONFIG_MTD is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_NAMESPACES=y
-# CONFIG_NETDEVICES is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_NET_KEY is not set
-CONFIG_NET_NS=y
-CONFIG_NEW_LEDS=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_NOP_USB_XCEIV is not set
-CONFIG_NO_HZ=y
-CONFIG_NR_CPUS=2
-# CONFIG_OC_ETM is not set
-# CONFIG_PACKET is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_PHONET=y
-CONFIG_PID_NS=y
-# CONFIG_PL310_ERRATA_588369 is not set
-# CONFIG_PL310_ERRATA_727915 is not set
-# CONFIG_PM_RUNTIME is not set
-# CONFIG_PM_TEST_SUSPEND is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY is not set
-CONFIG_PREEMPT=y
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_RCU=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_QUOTA is not set
-# CONFIG_QUOTACTL is not set
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set
-# CONFIG_RELAY is not set
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SDIO_UART is not set
-# CONFIG_SERIAL_8250 is not set
-# CONFIG_SERIO is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_SOUND is not set
-CONFIG_SPI=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_STAGING=y
-CONFIG_STANDALONE=y
-# CONFIG_SWAP is not set
-CONFIG_SWP_EMULATE=y
-CONFIG_SYSCTL_SYSCALL=y
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_SYSVIPC=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-CONFIG_TOUCHSCREEN_BU21013=y
-CONFIG_TPS6105X=y
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UNIX is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_DEBUG is not set
-CONFIG_USB_DEVICE_CLASS=y
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_WDM is not set
-CONFIG_USER_NS=y
-CONFIG_UTS_NS=y
-# CONFIG_VMSPLIT_2G is not set
-CONFIG_VMSPLIT_3G=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_W1 is not set
-# CONFIG_WATCHDOG is not set
-# CONFIG_WIRELESS is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_ZBOOT_ROM_TEXT=0
diff --git a/debian.linaro/config/enforce b/debian.linaro/config/enforce
index 224e0aeeb71..9fefd0c859e 100644
--- a/debian.linaro/config/enforce
+++ b/debian.linaro/config/enforce
@@ -76,10 +76,6 @@ value CONFIG_IPV6 y
value CONFIG_PRINTK_TIME y
-# CONFIG_PM is broken on s5pv310 (now exynos4) so don't enforce CONFIG_PM_DEBUG for the moment
-value CONFIG_ARCH_EXYNOS4 y | value CONFIG_PM_DEBUG y
-value CONFIG_ARCH_EXYNOS4 y | value CONFIG_PM_ADVANCED_DEBUG y
-
# LINARO kernels should be able to boot with a BTRFS rootfs without an initrd
value CONFIG_BTRFS_FS y
value CONFIG_LIBCRC32C y
diff --git a/debian.linaro/control.d/vars.linaro-s5pv310 b/debian.linaro/control.d/vars.linaro-s5pv310
deleted file mode 100644
index 1839dcf5744..00000000000
--- a/debian.linaro/control.d/vars.linaro-s5pv310
+++ /dev/null
@@ -1,8 +0,0 @@
-arch="armel"
-supported="Samsung s5pv310"
-desc="Samsung s5pv310 based platforms"
-target="Samsung TBD platform"
-bootloader="uboot-mkimage, flash-kernel"
-provides=""
-section_image="universe/base"
-do_debug="Yes"
diff --git a/debian.linaro/control.d/vars.linaro-u8500 b/debian.linaro/control.d/vars.linaro-u8500
deleted file mode 100644
index e9146437613..00000000000
--- a/debian.linaro/control.d/vars.linaro-u8500
+++ /dev/null
@@ -1,8 +0,0 @@
-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 7a3bfe4a660..247c1eaee8c 100644
--- a/debian.linaro/d-i/kernel-versions.in
+++ b/debian.linaro/d-i/kernel-versions.in
@@ -1,8 +1,8 @@
# 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-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 6aaab5087a9..b7760b3c2aa 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-s5pv310 linaro-u8500 linaro-vexpress
+flavours = linaro-mx51 linaro-omap linaro-vexpress
build_image = zImage
kernel_file = arch/$(build_arch)/boot/zImage
install_file = vmlinuz