From b5aaaa666a8519a63863c41ce0470ddc8e16b4cc Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 17:36:08 +0200 Subject: ARM: pxa: add Kconfig dependencies for ATAGS based boards Most of the traditional board files are no longer used by anyone and will be removed next year, while the DT based machine support remains. Adding a CONFIG_ATAGS dependency around all the board files means that they now actaully get disabled when ATAGS support is left out, and the individual boards that have no known users are marked as depending on CONFIG_UNUSED_BOARD_FILES, with the plan to remove them in early 2023 unless someone else shows interest. Laurence de Bruxelles intends to work on converting the Spitz/Akita/Borzoi family of Sharp Zaurus SL machines to DT, to make that easier those remain for the moment. In addition, the "Gumstix" machine is the one that is supported in qemu with 256MB of RAM, which makes it particularly nice for testing, I'm leaving it in hoping that someone can take care of converting it to DT as well. Finally, Marc Zyngier is still able to test the Zeus and Viper machines, so these could be saved as well if anyone wants to conver them to DT. This seems less likely, so I'm marking them as unused for the time being. For the defconfig files, both the pxa3xx_defconfig and pxa_defconfig now only enable the boards that are not marked as unused, while all the other ones explicitly enable CONFIG_UNUSED_BOARD_FILES to still allow building the kernels. Cc: Robert Jarzmik Cc: Daniel Mack Cc: Laurence de Bruxelles Acked-by: Marc Zyngier Signed-off-by: Arnd Bergmann --- arch/arm/configs/cm_x300_defconfig | 1 + arch/arm/configs/colibri_pxa270_defconfig | 1 + arch/arm/configs/colibri_pxa300_defconfig | 1 + arch/arm/configs/corgi_defconfig | 1 + arch/arm/configs/eseries_pxa_defconfig | 1 + arch/arm/configs/ezx_defconfig | 1 + arch/arm/configs/h5000_defconfig | 1 + arch/arm/configs/lpd270_defconfig | 1 + arch/arm/configs/lubbock_defconfig | 1 + arch/arm/configs/magician_defconfig | 1 + arch/arm/configs/mainstone_defconfig | 1 + arch/arm/configs/palmz72_defconfig | 1 + arch/arm/configs/pcm027_defconfig | 1 + arch/arm/configs/pxa255-idp_defconfig | 1 + arch/arm/configs/pxa3xx_defconfig | 7 +-- arch/arm/configs/pxa_defconfig | 77 +++++-------------------------- arch/arm/configs/trizeps4_defconfig | 1 + arch/arm/configs/viper_defconfig | 1 + arch/arm/configs/xcep_defconfig | 1 + arch/arm/configs/zeus_defconfig | 1 + arch/arm/mach-pxa/Kconfig | 53 +++++++++++++++++++++ 21 files changed, 83 insertions(+), 72 deletions(-) diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig index 9264f488c49f..31f41159bef2 100644 --- a/arch/arm/configs/cm_x300_defconfig +++ b/arch/arm/configs/cm_x300_defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH_PXA=y CONFIG_MACH_CM_X300=y CONFIG_AEABI=y CONFIG_HIGHMEM=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="root=/dev/mtdblock5 rootfstype=ubifs console=ttyS2,38400" CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_USERSPACE=y diff --git a/arch/arm/configs/colibri_pxa270_defconfig b/arch/arm/configs/colibri_pxa270_defconfig index ad745f5bfbb1..8357d721c69c 100644 --- a/arch/arm/configs/colibri_pxa270_defconfig +++ b/arch/arm/configs/colibri_pxa270_defconfig @@ -14,6 +14,7 @@ CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_ARCH_PXA=y CONFIG_MACH_COLIBRI=y CONFIG_AEABI=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y diff --git a/arch/arm/configs/colibri_pxa300_defconfig b/arch/arm/configs/colibri_pxa300_defconfig index d63469284b0b..42adfefdb6dc 100644 --- a/arch/arm/configs/colibri_pxa300_defconfig +++ b/arch/arm/configs/colibri_pxa300_defconfig @@ -2,6 +2,7 @@ CONFIG_ARCH_PXA=y CONFIG_MACH_COLIBRI300=y CONFIG_AEABI=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="console=ttyS0,115200 rw" CONFIG_CPU_IDLE=y CONFIG_FPE_NWFPE=y diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index bd9b5a013040..1f137f74050f 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig @@ -13,6 +13,7 @@ CONFIG_MACH_POODLE=y CONFIG_MACH_CORGI=y CONFIG_MACH_SHEPHERD=y CONFIG_MACH_HUSKY=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug" CONFIG_FPE_NWFPE=y CONFIG_BINFMT_AOUT=m diff --git a/arch/arm/configs/eseries_pxa_defconfig b/arch/arm/configs/eseries_pxa_defconfig index f76432fbc3af..b4c2e6457e04 100644 --- a/arch/arm/configs/eseries_pxa_defconfig +++ b/arch/arm/configs/eseries_pxa_defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH_PXA=y CONFIG_ARCH_PXA_ESERIES=y CONFIG_IWMMXT=y CONFIG_AEABI=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_KEXEC=y CONFIG_FPE_NWFPE=y CONFIG_MODULES=y diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig index 3a5eab10110f..1a41391d7367 100644 --- a/arch/arm/configs/ezx_defconfig +++ b/arch/arm/configs/ezx_defconfig @@ -15,6 +15,7 @@ CONFIG_EXPERT=y CONFIG_ARCH_PXA=y CONFIG_PXA_EZX=y CONFIG_AEABI=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="console=tty1 root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=3 ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0 debug" CONFIG_KEXEC=y CONFIG_CPU_FREQ=y diff --git a/arch/arm/configs/h5000_defconfig b/arch/arm/configs/h5000_defconfig index e1af11d3e632..d01f1a6bd04d 100644 --- a/arch/arm/configs/h5000_defconfig +++ b/arch/arm/configs/h5000_defconfig @@ -10,6 +10,7 @@ CONFIG_EXPERT=y CONFIG_ARCH_PXA=y CONFIG_MACH_H5000=y CONFIG_AEABI=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="keepinitrd" CONFIG_KEXEC=y CONFIG_FPE_NWFPE=y diff --git a/arch/arm/configs/lpd270_defconfig b/arch/arm/configs/lpd270_defconfig index fb74b0fc4761..b0c21a99a0a8 100644 --- a/arch/arm/configs/lpd270_defconfig +++ b/arch/arm/configs/lpd270_defconfig @@ -3,6 +3,7 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_PXA=y CONFIG_MACH_LOGICPD_PXA270=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200 mem=64M" CONFIG_FPE_NWFPE=y CONFIG_MODULES=y diff --git a/arch/arm/configs/lubbock_defconfig b/arch/arm/configs/lubbock_defconfig index ca226bce5025..4fc744c96196 100644 --- a/arch/arm/configs/lubbock_defconfig +++ b/arch/arm/configs/lubbock_defconfig @@ -3,6 +3,7 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_PXA=y CONFIG_ARCH_LUBBOCK=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200 mem=64M" CONFIG_FPE_NWFPE=y CONFIG_MODULES=y diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig index b65cce921ecc..9cbb63c69436 100644 --- a/arch/arm/configs/magician_defconfig +++ b/arch/arm/configs/magician_defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH_PXA=y CONFIG_MACH_H4700=y CONFIG_MACH_MAGICIAN=y CONFIG_AEABI=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="keepinitrd" CONFIG_KEXEC=y CONFIG_CPU_FREQ=y diff --git a/arch/arm/configs/mainstone_defconfig b/arch/arm/configs/mainstone_defconfig index dc1a88ed4de4..096cd7bc667a 100644 --- a/arch/arm/configs/mainstone_defconfig +++ b/arch/arm/configs/mainstone_defconfig @@ -3,6 +3,7 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_PXA=y CONFIG_MACH_MAINSTONE=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200 mem=64M" CONFIG_FPE_NWFPE=y CONFIG_MODULES=y diff --git a/arch/arm/configs/palmz72_defconfig b/arch/arm/configs/palmz72_defconfig index 5ceed551b972..a9a808bc2f70 100644 --- a/arch/arm/configs/palmz72_defconfig +++ b/arch/arm/configs/palmz72_defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH_PXA=y CONFIG_ARCH_PXA_PALM=y # CONFIG_MACH_PALMTX is not set CONFIG_AEABI=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="mem=32M console=tty root=/dev/mmcblk0" CONFIG_FPE_NWFPE=y CONFIG_PM=y diff --git a/arch/arm/configs/pcm027_defconfig b/arch/arm/configs/pcm027_defconfig index 5215a685e082..06bc9a8fef90 100644 --- a/arch/arm/configs/pcm027_defconfig +++ b/arch/arm/configs/pcm027_defconfig @@ -16,6 +16,7 @@ CONFIG_MACH_PCM027=y CONFIG_MACH_PCM990_BASEBOARD=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set +CONFIG_UNUSED_BOARD_FILES=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y diff --git a/arch/arm/configs/pxa255-idp_defconfig b/arch/arm/configs/pxa255-idp_defconfig index d141cc786145..ae0444949a87 100644 --- a/arch/arm/configs/pxa255-idp_defconfig +++ b/arch/arm/configs/pxa255-idp_defconfig @@ -3,6 +3,7 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_PXA=y CONFIG_ARCH_PXA_IDP=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="root=/dev/nfs ip=dhcp console=ttyS0,115200 mem=64M" CONFIG_FPE_NWFPE=y CONFIG_MODULES=y diff --git a/arch/arm/configs/pxa3xx_defconfig b/arch/arm/configs/pxa3xx_defconfig index f898af656249..d1e83b52e03a 100644 --- a/arch/arm/configs/pxa3xx_defconfig +++ b/arch/arm/configs/pxa3xx_defconfig @@ -7,9 +7,7 @@ CONFIG_KALLSYMS_ALL=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_PXA=y -CONFIG_MACH_LITTLETON=y -CONFIG_MACH_TAVOREVB=y -CONFIG_MACH_SAAR=y +CONFIG_MACH_PXA3XX_DT=y CONFIG_AEABI=y CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.1.100:/nfsroot/ ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on console=ttyS0,115200 mem=64M debug" CONFIG_FPE_NWFPE=y @@ -43,8 +41,6 @@ CONFIG_SMC91X=y # CONFIG_KEYBOARD_ATKBD is not set CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_PXA27x=y -CONFIG_KEYBOARD_PXA930_ROTARY=y -CONFIG_MOUSE_PXA930_TRKBALL=y CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_PXA=y @@ -59,7 +55,6 @@ CONFIG_GPIO_MAX732X=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCF857X=y CONFIG_GPIO_MAX7301=y -CONFIG_POWER_SUPPLY=y CONFIG_POWER_SUPPLY_DEBUG=y CONFIG_PDA_POWER=y CONFIG_BATTERY_DA9030=y diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index d115f7e8aa36..104a45722799 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -15,57 +15,13 @@ CONFIG_EMBEDDED=y CONFIG_PROFILING=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_PXA=y -CONFIG_ARCH_LUBBOCK=y -CONFIG_MACH_MAINSTONE=y -CONFIG_MACH_ZYLONITE300=y -CONFIG_MACH_ZYLONITE320=y -CONFIG_MACH_LITTLETON=y -CONFIG_MACH_TAVOREVB=y -CONFIG_MACH_SAAR=y -CONFIG_ARCH_PXA_IDP=y -CONFIG_ARCH_VIPER=y -CONFIG_MACH_ARCOM_ZEUS=y -CONFIG_MACH_BALLOON3=y -CONFIG_MACH_CSB726=y -CONFIG_CSB726_CSB701=y -CONFIG_MACH_EXEDA=y -CONFIG_MACH_CM_X300=y -CONFIG_MACH_CAPC7117=y CONFIG_ARCH_GUMSTIX=y -CONFIG_MACH_XCEP=y -CONFIG_TRIZEPS_PXA=y -CONFIG_MACH_TRIZEPS4WL=y -CONFIG_MACH_LOGICPD_PXA270=y -CONFIG_MACH_PCM027=y -CONFIG_MACH_PCM990_BASEBOARD=y -CONFIG_MACH_COLIBRI=y -CONFIG_MACH_COLIBRI_PXA270_INCOME=y -CONFIG_MACH_COLIBRI300=y -CONFIG_MACH_COLIBRI320=y -CONFIG_MACH_COLIBRI_EVALBOARD=y -CONFIG_MACH_VPAC270=y -CONFIG_MACH_H4700=y -CONFIG_MACH_H5000=y -CONFIG_MACH_HIMALAYA=y -CONFIG_MACH_MAGICIAN=y -CONFIG_MACH_MIOA701=y -CONFIG_PXA_EZX=y -CONFIG_MACH_MP900C=y -CONFIG_ARCH_PXA_PALM=y CONFIG_PXA_SHARPSL=y -CONFIG_MACH_POODLE=y -CONFIG_MACH_CORGI=y -CONFIG_MACH_SHEPHERD=y -CONFIG_MACH_HUSKY=y CONFIG_MACH_AKITA=y CONFIG_MACH_BORZOI=y -CONFIG_MACH_TOSA=y -CONFIG_TOSA_BT=m -CONFIG_TOSA_USE_EXT_KEYCODES=y -CONFIG_MACH_ICONTROL=y -CONFIG_ARCH_PXA_ESERIES=y -CONFIG_MACH_ZIPIT2=y +CONFIG_PXA_SYSTEMS_CPLDS=y CONFIG_AEABI=y +CONFIG_FORCE_MAX_ZONEORDER=9 CONFIG_CMDLINE="root=/dev/ram0 ro" CONFIG_KEXEC=y CONFIG_CPU_FREQ=y @@ -148,6 +104,7 @@ CONFIG_PCMCIA_PXA2XX=m CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_CONNECTOR=y +CONFIG_MTD=y CONFIG_MTD_AR7_PARTS=m CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_OF_PARTS=m @@ -159,16 +116,19 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y CONFIG_MTD_BLOCK=m CONFIG_NFTL=m CONFIG_NFTL_RW=y +CONFIG_MTD_CFI=y CONFIG_MTD_JEDECPROBE=m CONFIG_MTD_CFI_ADV_OPTIONS=y CONFIG_MTD_CFI_LE_BYTE_SWAP=y CONFIG_MTD_CFI_GEOMETRY=y CONFIG_MTD_OTP=y +CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=m CONFIG_MTD_CFI_STAA=m CONFIG_MTD_RAM=m CONFIG_MTD_ROM=m CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PXA2XX=m CONFIG_MTD_M25P80=m CONFIG_MTD_BLOCK2MTD=y @@ -178,7 +138,6 @@ CONFIG_MTD_ONENAND_VERIFY_WRITE=y CONFIG_MTD_ONENAND_GENERIC=m CONFIG_MTD_RAW_NAND=m CONFIG_MTD_NAND_SHARPSL=m -CONFIG_MTD_NAND_MARVELL=m CONFIG_MTD_NAND_TMIO=m CONFIG_MTD_NAND_BRCMNAND=m CONFIG_MTD_NAND_GPIO=m @@ -285,14 +244,12 @@ CONFIG_KEYBOARD_ATKBD=m CONFIG_KEYBOARD_QT1070=m CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_PXA27x=m -CONFIG_KEYBOARD_PXA930_ROTARY=m CONFIG_KEYBOARD_CROS_EC=m CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_CYAPA=m CONFIG_MOUSE_ELAN_I2C=m -CONFIG_MOUSE_PXA930_TRKBALL=m CONFIG_MOUSE_NAVPOINT_PXA27x=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=m @@ -303,12 +260,9 @@ CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_ELO=m CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_HTCPEN=m CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_UCB1400=m -CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_PCAP=m CONFIG_TOUCHSCREEN_ST1232=m @@ -319,7 +273,6 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_PCAP=m CONFIG_INPUT_ADXL34X=m CONFIG_SERIO=m -CONFIG_SERIO_SA1111=m CONFIG_LEGACY_PTY_COUNT=8 CONFIG_SERIAL_8250=m CONFIG_SERIAL_8250_CS=m @@ -332,6 +285,7 @@ CONFIG_I2C_CHARDEV=m CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_MUX_PINCTRL=m CONFIG_I2C_DESIGNWARE_PLATFORM=m +CONFIG_I2C_GPIO=y CONFIG_I2C_PXA_SLAVE=y CONFIG_I2C_XILINX=m CONFIG_I2C_CROS_EC_TUNNEL=m @@ -431,8 +385,10 @@ CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_PXA27x=m CONFIG_DRM=m +CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_TILEBLITTING=y +CONFIG_FB_PXA=y CONFIG_FB_PXA_OVERLAY=y CONFIG_FB_PXA_PARAMETERS=y CONFIG_PXA3XX_GCU=m @@ -459,21 +415,10 @@ CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=m CONFIG_SND_ATMEL_SOC=m CONFIG_SND_PXA2XX_SOC=m -CONFIG_SND_PXA2XX_SOC_CORGI=m +CONFIG_SND_PXA_SOC_SSP=m CONFIG_SND_PXA2XX_SOC_SPITZ=m -CONFIG_SND_PXA2XX_SOC_Z2=m -CONFIG_SND_PXA2XX_SOC_POODLE=m -CONFIG_SND_PXA2XX_SOC_TOSA=m -CONFIG_SND_PXA2XX_SOC_E740=m -CONFIG_SND_PXA2XX_SOC_E750=m -CONFIG_SND_PXA2XX_SOC_E800=m -CONFIG_SND_PXA2XX_SOC_EM_X270=m -CONFIG_SND_PXA2XX_SOC_PALM27X=y -CONFIG_SND_SOC_ZYLONITE=m -CONFIG_SND_PXA2XX_SOC_HX4700=m -CONFIG_SND_PXA2XX_SOC_MAGICIAN=m -CONFIG_SND_PXA2XX_SOC_MIOA701=m CONFIG_SND_SOC_AK4642=m +CONFIG_SND_SOC_WM8731_I2C=m CONFIG_SND_SOC_WM8978=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SOUND_PRIME=m diff --git a/arch/arm/configs/trizeps4_defconfig b/arch/arm/configs/trizeps4_defconfig index 01a0901120e8..009abe1e49ef 100644 --- a/arch/arm/configs/trizeps4_defconfig +++ b/arch/arm/configs/trizeps4_defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH_PXA=y CONFIG_TRIZEPS_PXA=y CONFIG_MACH_TRIZEPS4=y CONFIG_AEABI=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="root=fe01 console=ttyS0,38400n8 loglevel=5" CONFIG_FPE_NWFPE=y CONFIG_FPE_NWFPE_XP=y diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig index 0a2ad9ec8c89..02f9849893b2 100644 --- a/arch/arm/configs/viper_defconfig +++ b/arch/arm/configs/viper_defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH_PXA=y CONFIG_ARCH_VIPER=y CONFIG_IWMMXT=y CONFIG_AEABI=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="root=31:02 rootfstype=jffs2 ro console=ttyS0,115200" CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m diff --git a/arch/arm/configs/xcep_defconfig b/arch/arm/configs/xcep_defconfig index 35b3689dc1c5..0453948d52ef 100644 --- a/arch/arm/configs/xcep_defconfig +++ b/arch/arm/configs/xcep_defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH_PXA=y CONFIG_MACH_XCEP=y CONFIG_IWMMXT=y CONFIG_AEABI=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="root=mtd4 rootfstype=jffs2 ro console=ttyS0,115200" CONFIG_FPE_NWFPE=y CONFIG_KPROBES=y diff --git a/arch/arm/configs/zeus_defconfig b/arch/arm/configs/zeus_defconfig index 37ae98a762c0..c4535315e216 100644 --- a/arch/arm/configs/zeus_defconfig +++ b/arch/arm/configs/zeus_defconfig @@ -5,6 +5,7 @@ CONFIG_LOG_BUF_SHIFT=13 CONFIG_ARCH_PXA=y CONFIG_MACH_ARCOM_ZEUS=y CONFIG_AEABI=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="root=31:02 rootfstype=jffs2 ro console=ttyS0,115200" CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index a5df1d9f3360..b90d98bae68d 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -54,14 +54,18 @@ config MACH_PXA3XX_DT the device tree. Needn't select any other machine while MACH_PXA3XX_DT is enabled. +if ATAGS + config ARCH_LUBBOCK bool "Intel DBPXA250 Development Platform (aka Lubbock)" + depends on UNUSED_BOARD_FILES select GPIO_REG select PXA25x select SA1111 config MACH_MAINSTONE bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)" + depends on UNUSED_BOARD_FILES select GPIO_REG select PXA27x @@ -71,23 +75,27 @@ config MACH_ZYLONITE config MACH_ZYLONITE300 bool "PXA3xx Development Platform (aka Zylonite) PXA300/310" + depends on UNUSED_BOARD_FILES select CPU_PXA300 select CPU_PXA310 select MACH_ZYLONITE config MACH_ZYLONITE320 bool "PXA3xx Development Platform (aka Zylonite) PXA320" + depends on UNUSED_BOARD_FILES select CPU_PXA320 select MACH_ZYLONITE config MACH_LITTLETON bool "PXA3xx Form Factor Platform (aka Littleton)" + depends on UNUSED_BOARD_FILES select CPU_PXA300 select CPU_PXA310 select PXA3xx config MACH_TAVOREVB bool "PXA930 Evaluation Board (aka TavorEVB)" + depends on UNUSED_BOARD_FILES select CPU_PXA930 select CPU_PXA935 select PXA3xx @@ -96,6 +104,7 @@ config MACH_TAVOREVB config MACH_SAAR bool "PXA930 Handheld Platform (aka SAAR)" + depends on UNUSED_BOARD_FILES select CPU_PXA930 select CPU_PXA935 select PXA3xx @@ -106,10 +115,12 @@ comment "Third Party Dev Platforms (sorted by vendor name)" config ARCH_PXA_IDP bool "Accelent Xscale IDP" + depends on UNUSED_BOARD_FILES select PXA25x config ARCH_VIPER bool "Arcom/Eurotech VIPER SBC" + depends on UNUSED_BOARD_FILES select ARCOM_PCMCIA select I2C_GPIO if I2C=y select ISA @@ -117,17 +128,20 @@ config ARCH_VIPER config MACH_ARCOM_ZEUS bool "Arcom/Eurotech ZEUS SBC" + depends on UNUSED_BOARD_FILES select ARCOM_PCMCIA select ISA select PXA27x config MACH_BALLOON3 bool "Balloon 3 board" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x config MACH_CSB726 bool "Enable Cogent CSB726 System On a Module" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x help @@ -136,16 +150,19 @@ config MACH_CSB726 config CSB726_CSB701 bool "Enable support for CSB701 baseboard" + depends on UNUSED_BOARD_FILES depends on MACH_CSB726 config MACH_CM_X300 bool "CompuLab CM-X300 modules" + depends on UNUSED_BOARD_FILES select CPU_PXA300 select CPU_PXA310 select PXA3xx config MACH_CAPC7117 bool "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM" + depends on UNUSED_BOARD_FILES select CPU_PXA320 select PXA3xx @@ -170,6 +187,7 @@ endchoice config MACH_XCEP bool "Iskratel Electronics XCEP" + depends on UNUSED_BOARD_FILES select MTD select MTD_CFI select MTD_CFI_INTELEXT @@ -181,6 +199,7 @@ config MACH_XCEP config TRIZEPS_PXA bool "PXA based Keith und Koep Trizeps DIMM-Modules" + depends on UNUSED_BOARD_FILES config MACH_TRIZEPS4 bool "Keith und Koep Trizeps4 DIMM-Module" @@ -222,15 +241,18 @@ config TRIZEPS_PCMCIA config MACH_LOGICPD_PXA270 bool "LogicPD PXA270 Card Engine Development Platform" + depends on UNUSED_BOARD_FILES select PXA27x config MACH_PCM027 bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x config MACH_PCM990_BASEBOARD bool "PHYTEC PCM-990 development board" + depends on UNUSED_BOARD_FILES depends on MACH_PCM027 choice @@ -250,30 +272,36 @@ endchoice config MACH_COLIBRI bool "Toradex Colibri PXA270" + depends on UNUSED_BOARD_FILES select PXA27x config MACH_COLIBRI_PXA270_INCOME bool "Income s.r.o. PXA270 SBC" + depends on UNUSED_BOARD_FILES depends on MACH_COLIBRI select PXA27x config MACH_COLIBRI300 bool "Toradex Colibri PXA300/310" + depends on UNUSED_BOARD_FILES select CPU_PXA300 select CPU_PXA310 select PXA3xx config MACH_COLIBRI320 bool "Toradex Colibri PXA320" + depends on UNUSED_BOARD_FILES select CPU_PXA320 select PXA3xx config MACH_COLIBRI_EVALBOARD bool "Toradex Colibri Evaluation Carrier Board support" + depends on UNUSED_BOARD_FILES depends on MACH_COLIBRI || MACH_COLIBRI300 || MACH_COLIBRI320 config MACH_VPAC270 bool "Voipac PXA270" + depends on UNUSED_BOARD_FILES select HAVE_PATA_PLATFORM select PXA27x help @@ -283,24 +311,29 @@ comment "End-user Products (sorted by vendor name)" config MACH_H4700 bool "HP iPAQ hx4700" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x config MACH_H5000 bool "HP iPAQ h5000" + depends on UNUSED_BOARD_FILES select PXA25x config MACH_HIMALAYA bool "HTC Himalaya Support" + depends on UNUSED_BOARD_FILES select CPU_PXA26x config MACH_MAGICIAN bool "Enable HTC Magician Support" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x config MACH_MIOA701 bool "Mitac Mio A701 Support" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x help @@ -310,6 +343,7 @@ config MACH_MIOA701 config PXA_EZX bool "Motorola EZX Platform" + depends on UNUSED_BOARD_FILES select IWMMXT select PXA27x @@ -345,16 +379,19 @@ config MACH_EZX_E2 config MACH_MP900C bool "Nec Mobilepro 900/c" + depends on UNUSED_BOARD_FILES select PXA25x config ARCH_PXA_PALM bool "PXA based Palm PDAs" + depends on UNUSED_BOARD_FILES config MACH_PALM27X bool config MACH_PALMTE2 bool "Palm Tungsten|E2" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select PXA25x @@ -373,6 +410,7 @@ config MACH_PALMTC config MACH_PALMT5 bool "Palm Tungsten|T5" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select IWMMXT @@ -384,6 +422,7 @@ config MACH_PALMT5 config MACH_PALMTX bool "Palm T|X" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select IWMMXT @@ -395,6 +434,7 @@ config MACH_PALMTX config MACH_PALMZ72 bool "Palm Zire 72" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select IWMMXT @@ -406,6 +446,7 @@ config MACH_PALMZ72 config MACH_PALMLD bool "Palm LifeDrive" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select IWMMXT @@ -421,6 +462,7 @@ config PALM_TREO config MACH_CENTRO bool "Palm Centro 685 (GSM)" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select IWMMXT @@ -433,6 +475,7 @@ config MACH_CENTRO config MACH_TREO680 bool "Palm Treo 680" + depends on UNUSED_BOARD_FILES default y depends on ARCH_PXA_PALM select IWMMXT @@ -465,24 +508,28 @@ config PXA_SHARPSL_DETECT_MACH_ID config MACH_POODLE bool "Enable Sharp SL-5600 (Poodle) Support" depends on PXA_SHARPSL + depends on UNUSED_BOARD_FILES select PXA25x select SHARP_LOCOMO config MACH_CORGI bool "Enable Sharp SL-C700 (Corgi) Support" depends on PXA_SHARPSL + depends on UNUSED_BOARD_FILES select PXA25x select PXA_SHARP_C7xx config MACH_SHEPHERD bool "Enable Sharp SL-C750 (Shepherd) Support" depends on PXA_SHARPSL + depends on UNUSED_BOARD_FILES select PXA25x select PXA_SHARP_C7xx config MACH_HUSKY bool "Enable Sharp SL-C760 (Husky) Support" depends on PXA_SHARPSL + depends on UNUSED_BOARD_FILES select PXA25x select PXA_SHARP_C7xx @@ -509,6 +556,7 @@ config MACH_BORZOI config MACH_TOSA bool "Enable Sharp SL-6000x (Tosa) Support" + depends on UNUSED_BOARD_FILES depends on PXA_SHARPSL select PXA25x @@ -532,11 +580,13 @@ config TOSA_USE_EXT_KEYCODES config MACH_ICONTROL bool "TMT iControl/SafeTCam based on the MXM-8x10 CoM" + depends on UNUSED_BOARD_FILES select CPU_PXA320 select PXA3xx config ARCH_PXA_ESERIES bool "PXA based Toshiba e-series PDAs" + depends on UNUSED_BOARD_FILES select FB_W100 select FB select PXA25x @@ -591,7 +641,10 @@ config MACH_E800 config MACH_ZIPIT2 bool "Zipit Z2 Handheld" + depends on UNUSED_BOARD_FILES select PXA27x + +endif # ATAGS endmenu config PXA25x -- cgit