Commit 9a9e1be1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: sa1100: remove unused board files 



The Cerf, H3100, Badge4, Hackkit, LART, NanoEngine, PLEB, Shannon and
Simpad machines were all marked as unused as there are no known users
left. Remove all of these, along with references to them in defconfig
files and drivers.

Four machines remain now: Assabet, Collie (Zaurus SL5500), iPAQ H3600
and Jornada 720, each of which had one person still using them, with
Collie also being supported in Qemu.

Cc: Peter Chubb <peter.chubb@unsw.edu.au>
Cc: Stefan Eletzhofer <stefan.eletzhofer@eletztrick.de>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarLee Jones <lee@kernel.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 8faf91c4

MAINTAINERS

+0 −11
Original line number Diff line number Diff line
@@ -2633,17 +2633,6 @@ S: Maintained 
W:	http://hackndev.com

F:	arch/arm/mach-pxa/palmz72.*









ARM/PLEB SUPPORT









M:	Peter Chubb <pleb@gelato.unsw.edu.au>









S:	Maintained









W:	http://www.disy.cse.unsw.edu.au/Hardware/PLEB

















ARM/PT DIGITAL BOARD PORT









M:	Stefan Eletzhofer <stefan.eletzhofer@eletztrick.de>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









W:	http://www.armlinux.org.uk/

















ARM/QUALCOMM SUPPORT









M:	Andy Gross <agross@kernel.org>









M:	Bjorn Andersson <andersson@kernel.org>
































arch/arm/Kconfig



+0
−6






























Original line number
Diff line number
Diff line







@@ -927,12 +927,6 @@ config ISA







config ISA_DMA_API









	bool



















config PCI_NANOENGINE









	bool "BSE nanoEngine PCI support"









	depends on SA1100_NANOENGINE









	help









	  Enable PCI on the BSE nanoEngine board.



















config ARM_ERRATA_814220









	bool "ARM errata: Cache maintenance by set/way operations can execute out of order"









	depends on CPU_V7
































arch/arm/boot/compressed/head-sa1100.S



+0
−4






























Original line number
Diff line number
Diff line







@@ -19,10 +19,6 @@ __SA1100_start:







		@ Preserve r8/r7 i.e. kernel entry values









#ifdef CONFIG_SA1100_COLLIE









		mov	r7, #MACH_TYPE_COLLIE









#endif









#ifdef CONFIG_SA1100_SIMPAD









		@ UNTIL we've something like an open bootldr









		mov	r7, #MACH_TYPE_SIMPAD	@should be 87









#endif









		mrc	p15, 0, r0, c1, c0, 0	@ read control reg









		ands	r0, r0, #0x0d
































arch/arm/configs/badge4_defconfig
deleted100644 → 0



+0
−105






























Original line number
Diff line number
Diff line









CONFIG_LOG_BUF_SHIFT=14









CONFIG_EXPERT=y









CONFIG_ARCH_MULTI_V4=y









# CONFIG_ARCH_MULTI_V7 is not set









CONFIG_ARCH_SA1100=y









CONFIG_SA1100_BADGE4=y









CONFIG_UNUSED_BOARD_FILES=y









CONFIG_CMDLINE="init=/linuxrc root=/dev/mtdblock3"









CONFIG_CPU_FREQ_GOV_PERFORMANCE=y









CONFIG_FPE_NWFPE=y









CONFIG_MODULES=y









CONFIG_MODVERSIONS=y









CONFIG_PARTITION_ADVANCED=y









CONFIG_BINFMT_MISC=m









CONFIG_NET=y









CONFIG_PACKET=y









CONFIG_UNIX=y









CONFIG_INET=y









# CONFIG_IPV6 is not set









CONFIG_BT=m









CONFIG_BT_HCIUART=m









CONFIG_BT_HCIVHCI=m









# CONFIG_FW_LOADER is not set









CONFIG_MTD=y









CONFIG_MTD_DEBUG=y









CONFIG_MTD_BLOCK=y









CONFIG_MTD_CFI=y









CONFIG_MTD_CFI_ADV_OPTIONS=y









CONFIG_MTD_CFI_GEOMETRY=y









# CONFIG_MTD_CFI_I2 is not set









CONFIG_MTD_CFI_INTELEXT=y









CONFIG_MTD_RAM=y









CONFIG_MTD_SA1100=y









CONFIG_PARPORT=m









CONFIG_BLK_DEV_LOOP=y









CONFIG_BLK_DEV_NBD=m









CONFIG_SCSI=y









CONFIG_BLK_DEV_SD=y









CONFIG_CHR_DEV_ST=m









CONFIG_BLK_DEV_SR=m









CONFIG_CHR_DEV_SG=y









CONFIG_NETDEVICES=y









CONFIG_USB_CATC=m









CONFIG_USB_KAWETH=m









CONFIG_USB_PEGASUS=m









CONFIG_USB_USBNET=m









CONFIG_USB_ALI_M5632=y









CONFIG_USB_AN2720=y









CONFIG_USB_EPSON2888=y









CONFIG_USB_KC2190=y









# CONFIG_INPUT is not set









# CONFIG_SERIO is not set









# CONFIG_VT is not set









CONFIG_SERIAL_SA1100=y









CONFIG_SERIAL_SA1100_CONSOLE=y









CONFIG_I2C=m









CONFIG_I2C_CHARDEV=m









CONFIG_I2C_ELEKTOR=m









CONFIG_WATCHDOG=y









CONFIG_SOFT_WATCHDOG=m









CONFIG_SA1100_WATCHDOG=m









CONFIG_SOUND=y









CONFIG_SOUND_PRIME=y









CONFIG_USB=y









CONFIG_USB_MON=y









CONFIG_USB_ACM=m









CONFIG_USB_PRINTER=m









CONFIG_USB_STORAGE=y









CONFIG_USB_STORAGE_DEBUG=y









CONFIG_USB_MDC800=m









CONFIG_USB_MICROTEK=m









CONFIG_USB_USS720=m









CONFIG_USB_SERIAL=m









CONFIG_USB_SERIAL_GENERIC=y









CONFIG_USB_SERIAL_BELKIN=m









CONFIG_USB_SERIAL_WHITEHEAT=m









CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m









CONFIG_USB_SERIAL_EMPEG=m









CONFIG_USB_SERIAL_FTDI_SIO=m









CONFIG_USB_SERIAL_VISOR=m









CONFIG_USB_SERIAL_IR=m









CONFIG_USB_SERIAL_EDGEPORT=m









CONFIG_USB_SERIAL_KEYSPAN_PDA=m









CONFIG_USB_SERIAL_KEYSPAN=m









CONFIG_USB_SERIAL_MCT_U232=m









CONFIG_USB_SERIAL_PL2303=m









CONFIG_USB_SERIAL_CYBERJACK=m









CONFIG_USB_SERIAL_OMNINET=m









CONFIG_EXT2_FS=m









CONFIG_EXT3_FS=m









CONFIG_MSDOS_FS=y









CONFIG_VFAT_FS=m









CONFIG_TMPFS=y









CONFIG_JFFS2_FS=y









CONFIG_CRAMFS=m









CONFIG_MINIX_FS=m









CONFIG_NFS_FS=m









CONFIG_NFS_V3=y









CONFIG_SMB_FS=m









CONFIG_DEBUG_KERNEL=y









# CONFIG_DEBUG_BUGVERBOSE is not set









CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y









CONFIG_MAGIC_SYSRQ=y









CONFIG_DEBUG_USER=y









CONFIG_DEBUG_LL=y
























arch/arm/configs/cerfcube_defconfig
deleted100644 → 0



+0
−73






























Original line number
Diff line number
Diff line









CONFIG_SYSVIPC=y









CONFIG_BSD_PROCESS_ACCT=y









CONFIG_LOG_BUF_SHIFT=14









CONFIG_ARCH_MULTI_V4=y









# CONFIG_ARCH_MULTI_V7 is not set









CONFIG_ARCH_SA1100=y









CONFIG_SA1100_CERF=y









CONFIG_SA1100_CERF_FLASH_16MB=y









CONFIG_UNUSED_BOARD_FILES=y









CONFIG_CMDLINE="console=ttySA0,38400 root=/dev/mtdblock3 rootfstype=jffs2 rw mem=32M init=/linuxrc"









CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y









CONFIG_CPU_FREQ_GOV_USERSPACE=m









CONFIG_FPE_FASTFPE=y









CONFIG_PM=y









CONFIG_MODULES=y









CONFIG_MODULE_UNLOAD=y









CONFIG_MODULE_FORCE_UNLOAD=y









CONFIG_PARTITION_ADVANCED=y









CONFIG_NET=y









CONFIG_PACKET=y









CONFIG_UNIX=y









CONFIG_INET=y









CONFIG_IP_PNP=y









CONFIG_IP_PNP_DHCP=y









CONFIG_IP_PNP_BOOTP=y









CONFIG_IP_PNP_RARP=y









# CONFIG_IPV6 is not set









CONFIG_PCCARD=m









CONFIG_PCMCIA_SA1100=m









CONFIG_MTD=y









CONFIG_MTD_CMDLINE_PARTS=y









CONFIG_MTD_REDBOOT_PARTS=y









CONFIG_MTD_BLOCK=y









CONFIG_MTD_CFI=y









CONFIG_MTD_CFI_INTELEXT=y









CONFIG_MTD_SA1100=y









CONFIG_BLK_DEV_LOOP=m









CONFIG_BLK_DEV_RAM=m









CONFIG_NETDEVICES=y









CONFIG_NET_ETHERNET=y









CONFIG_NET_PCI=y









# CONFIG_INPUT_KEYBOARD is not set









# CONFIG_INPUT_MOUSE is not set









# CONFIG_SERIO is not set









CONFIG_SERIAL_SA1100=y









CONFIG_SERIAL_SA1100_CONSOLE=y









CONFIG_WATCHDOG=y









CONFIG_SA1100_WATCHDOG=m









# CONFIG_VGA_CONSOLE is not set









CONFIG_NEW_LEDS=y









CONFIG_LEDS_CLASS=y









CONFIG_LEDS_TRIGGERS=y









CONFIG_LEDS_TRIGGER_CPU=y









CONFIG_EXT2_FS=m









CONFIG_EXT3_FS=m









CONFIG_MSDOS_FS=m









CONFIG_VFAT_FS=m









CONFIG_TMPFS=y









CONFIG_JFFS2_FS=y









CONFIG_ROMFS_FS=y









CONFIG_NFS_FS=m









CONFIG_NFS_V3=y









CONFIG_NFS_V4=y









CONFIG_NFSD=m









CONFIG_NFSD_V4=y









CONFIG_SMB_FS=m









CONFIG_NLS=y









CONFIG_NLS_CODEPAGE_437=m









CONFIG_NLS_ISO8859_1=m









CONFIG_DEBUG_KERNEL=y









CONFIG_MAGIC_SYSRQ=y









CONFIG_DEBUG_USER=y









CONFIG_DEBUG_LL=y