Commit 9d323914 authored by Robert Jarzmik's avatar Robert Jarzmik Committed by Arnd Bergmann
Browse files

ARM: pxa: remove Compulab pxa2xx boards 

As these boards have no more users nor testers, and patching them has
become a burden, be that because of the PCI part or the MTD NAND
support, let's remove them.

The cm-x300 will for now remain and represent Compulab boards at its
best in the PXA department.

Link: https://lore.kernel.org/r/20200521185140.27276-1-robert.jarzmik@free.fr


Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarMike Rapoport <rppt@kernel.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 803b504b

arch/arm/configs/cm_x2xx_defconfig

deleted100644 → 0
+0 −173
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_PXA=y

CONFIG_MACH_ARMCORE=y

CONFIG_PCI=y

CONFIG_PCCARD=m

CONFIG_YENTA=m

# CONFIG_YENTA_O2 is not set

# CONFIG_YENTA_RICOH is not set

# CONFIG_YENTA_ENE_TUNE is not set

# CONFIG_YENTA_TOSHIBA is not set

CONFIG_PCMCIA_PXA2XX=m

CONFIG_NO_HZ=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=1f03 mem=32M"

CONFIG_FPE_NWFPE=y

CONFIG_PM=y

CONFIG_APM_EMULATION=m

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_BT=m

CONFIG_BT_RFCOMM=m

CONFIG_BT_BNEP=m

CONFIG_BT_HIDP=m

CONFIG_LIB80211=m

CONFIG_FW_LOADER=m

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PXA2XX=y

CONFIG_MTD_RAW_NAND=y

CONFIG_MTD_NAND_GPIO=m

CONFIG_MTD_NAND_CM_X270=y

CONFIG_MTD_NAND_PLATFORM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_ATA=m

# CONFIG_SATA_PMP is not set

CONFIG_PATA_PCMCIA=m

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_DM9000=y

CONFIG_DM9000_DEBUGLEVEL=1

CONFIG_NET_PCI=y

CONFIG_8139TOO=m

# CONFIG_8139TOO_PIO is not set

CONFIG_PPP=m

CONFIG_PPP_MULTILINK=y

CONFIG_PPP_FILTER=y

CONFIG_PPP_ASYNC=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPP_BSDCOMP=m

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_PXA27x=m

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_UCB1400=m

# CONFIG_SERIO_SERPORT is not set

CONFIG_SERIAL_PXA=y

CONFIG_SERIAL_PXA_CONSOLE=y

CONFIG_LEGACY_PTY_COUNT=16

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=m

CONFIG_I2C_PXA=y

CONFIG_SPI=y

CONFIG_SPI_PXA2XX=m

# CONFIG_HWMON is not set

CONFIG_UCB1400_CORE=m

CONFIG_FB=y

CONFIG_FB_PXA=y

CONFIG_FB_PXA_PARAMETERS=y

CONFIG_FB_MBX=m

# CONFIG_LCD_CLASS_DEVICE is not set

# CONFIG_BACKLIGHT_CLASS_DEVICE is not set

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_PCI is not set

CONFIG_SND_PXA2XX_AC97=m

# CONFIG_SND_SPI is not set

# CONFIG_SND_USB is not set

# CONFIG_SND_PCMCIA is not set

CONFIG_HID_A4TECH=y

CONFIG_HID_APPLE=y

CONFIG_HID_BELKIN=y

CONFIG_HID_CHERRY=y

CONFIG_HID_CHICONY=y

CONFIG_HID_CYPRESS=y

CONFIG_HID_EZKEY=y

CONFIG_HID_GYRATION=y

CONFIG_HID_LOGITECH=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MONTEREY=y

CONFIG_HID_PANTHERLORD=y

CONFIG_HID_PETALYNX=y

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

CONFIG_USB=y

CONFIG_USB_MON=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=m

CONFIG_MMC_PXA=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=m

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_V3020=y

CONFIG_RTC_DRV_PXA=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_VFAT_FS=m

# CONFIG_PROC_PAGE_MONITOR is not set

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_SUMMARY=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_CIFS=m

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_ISO8859_1=m

CONFIG_NLS_UTF8=m

CONFIG_FRAME_WARN=0

CONFIG_DEBUG_KERNEL=y

# CONFIG_DETECT_SOFTLOCKUP is not set

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

arch/arm/configs/em_x270_defconfig

deleted100644 → 0
+0 −178
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_PXA=y

CONFIG_MACH_EM_X270=y

CONFIG_MACH_EXEDA=y

CONFIG_NO_HZ=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=1f03 mem=32M"

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_GOV_USERSPACE=m

CONFIG_FPE_NWFPE=y

CONFIG_PM=y

CONFIG_APM_EMULATION=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_BT=m

CONFIG_BT_RFCOMM=m

CONFIG_BT_BNEP=m

CONFIG_BT_HIDP=m

CONFIG_BT_HCIBTUSB=m

CONFIG_LIB80211=m

CONFIG_FW_LOADER=m

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PXA2XX=y

CONFIG_MTD_RAW_NAND=y

CONFIG_MTD_NAND_PLATFORM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_DM9000=y

CONFIG_DM9000_DEBUGLEVEL=1

CONFIG_PPP=m

CONFIG_PPP_MULTILINK=y

CONFIG_PPP_FILTER=y

CONFIG_PPP_ASYNC=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPP_BSDCOMP=m

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_APMPOWER=y

CONFIG_KEYBOARD_GPIO=y

CONFIG_KEYBOARD_PXA27x=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_TOUCHSCREEN_DA9034 is not set

CONFIG_TOUCHSCREEN_WM97XX=m

# CONFIG_TOUCHSCREEN_WM9705 is not set

# CONFIG_TOUCHSCREEN_WM9713 is not set

# CONFIG_SERIO_SERPORT is not set

CONFIG_SERIAL_PXA=y

CONFIG_SERIAL_PXA_CONSOLE=y

CONFIG_LEGACY_PTY_COUNT=16

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=m

CONFIG_I2C_PXA=y

CONFIG_SPI=y

CONFIG_SPI_PXA2XX=y

CONFIG_POWER_SUPPLY=y

CONFIG_BATTERY_DA9030=y

# CONFIG_HWMON is not set

CONFIG_PMIC_DA903X=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_DA903X=y

CONFIG_FB=y

CONFIG_FB_PXA=y

CONFIG_FB_PXA_PARAMETERS=y

CONFIG_FB_MBX=m

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_TDO24M=y

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_BACKLIGHT_DA903X=m

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_SPI is not set

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=m

CONFIG_SND_PXA2XX_SOC=m

CONFIG_SND_PXA2XX_SOC_EM_X270=m

CONFIG_HID_A4TECH=y

CONFIG_HID_APPLE=y

CONFIG_HID_BELKIN=y

CONFIG_HID_CHERRY=y

CONFIG_HID_CHICONY=y

CONFIG_HID_CYPRESS=y

CONFIG_HID_EZKEY=y

CONFIG_HID_GYRATION=y

CONFIG_HID_LOGITECH=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MONTEREY=y

CONFIG_HID_PANTHERLORD=y

CONFIG_HID_PETALYNX=y

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

CONFIG_USB=y

CONFIG_USB_MON=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=m

CONFIG_MMC_PXA=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_DA903X=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_V3020=y

CONFIG_RTC_DRV_PXA=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_VFAT_FS=m

# CONFIG_PROC_PAGE_MONITOR is not set

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_SUMMARY=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_CIFS=m

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_ISO8859_1=m

CONFIG_NLS_UTF8=m

CONFIG_FRAME_WARN=0

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_DETECT_SOFTLOCKUP is not set

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_AES=m

CONFIG_CRYPTO_ARC4=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

arch/arm/configs/pxa_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ CONFIG_MACH_ARCOM_ZEUS=y 
CONFIG_MACH_BALLOON3=y

CONFIG_MACH_CSB726=y

CONFIG_CSB726_CSB701=y

CONFIG_MACH_ARMCORE=y

CONFIG_MACH_EM_X270=y

CONFIG_MACH_EXEDA=y

CONFIG_MACH_CM_X300=y

CONFIG_MACH_CAPC7117=y

arch/arm/mach-pxa/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -123,23 +123,6 @@ config CSB726_CSB701 
	bool "Enable support for CSB701 baseboard"

	depends on MACH_CSB726



config MACH_ARMCORE

	bool "CompuLab CM-X255/CM-X270 modules"

	select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI

	select IWMMXT

	select HAVE_PCI

	select NEED_MACH_IO_H if PCI

	select PXA25x

	select PXA27x



config MACH_EM_X270

	bool "CompuLab EM-x270 platform"

	select PXA27x



config MACH_EXEDA

	bool "CompuLab eXeda platform"

	select PXA27x



config MACH_CM_X300

	bool "CompuLab CM-X300 modules"

	select CPU_PXA300

arch/arm/mach-pxa/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@ obj-$(CONFIG_MACH_ARCOM_ZEUS) += zeus.o 
obj-$(CONFIG_MACH_BALLOON3)	+= balloon3.o

obj-$(CONFIG_MACH_CSB726)	+= csb726.o

obj-$(CONFIG_CSB726_CSB701)	+= csb701.o

obj-$(CONFIG_MACH_ARMCORE)      += cm-x2xx.o cm-x255.o cm-x270.o

ifeq ($(CONFIG_PCI),y)

obj-$(CONFIG_MACH_ARMCORE)	+= cm-x2xx-pci.o

endif

obj-$(CONFIG_MACH_EM_X270)	+= em-x270.o

obj-$(CONFIG_MACH_CM_X300)      += cm-x300.o

obj-$(CONFIG_MACH_CAPC7117)     += capc7117.o mxm8x10.o

obj-$(CONFIG_ARCH_GUMSTIX)	+= gumstix.o