From 96a4ce30c27eb50bffa26a8ff2807cca74c707ac Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 5 Jul 2022 14:10:34 +0200 Subject: ARM: add ATAGS dependencies to non-DT platforms There are a total of eight platforms that only suppor ATAGS based boot with board files but no devicetree booting. For dove, the DT support is part of the mvebu platform, which shares driver but no code in arch/arm. Most of these will never get converted to DT, and the majority of the board files appear to be entirely unused already. There are still known users on a few machines, and there may be interest in converting some omap1, ep93xx or footbridge machines over in the future. For the moment, just add a Kconfig dependency to hide these platforms completely when CONFIG_ATAGS is disabled, and reorder the priority of the options: Rather than offering to turn ATAGS off for platforms that have DT support, make it a top-level setting that determines which platforms are visible. The s3c24xx platform supports one machine with DT support, but it cannot be built without also including ATAGS support, and the entire platform is scheduled for removal, so leaving the entire platform behind a dependency seems good enough. All defconfig files should keep working, as the option remains default enabled. Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 5 ++++- arch/arm/mach-cns3xxx/Kconfig | 1 + arch/arm/mach-dove/Kconfig | 1 + arch/arm/mach-ep93xx/Kconfig | 1 + arch/arm/mach-iop32x/Kconfig | 1 + arch/arm/mach-mv78xx0/Kconfig | 1 + arch/arm/mach-omap1/Kconfig | 1 + arch/arm/mach-s3c/Kconfig.s3c24xx | 2 +- 8 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7630ba9cb6cc..4349525cd1e1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -350,6 +350,7 @@ config ARCH_MULTIPLATFORM config ARCH_FOOTBRIDGE bool "FootBridge" depends on CPU_LITTLE_ENDIAN + depends on ATAGS select CPU_SA110 select FOOTBRIDGE select NEED_MACH_MEMORY_H @@ -361,6 +362,7 @@ config ARCH_RPC bool "RiscPC" depends on !CC_IS_CLANG && GCC_VERSION < 90100 && GCC_VERSION >= 60000 depends on CPU_LITTLE_ENDIAN + depends on ATAGS select ARCH_ACORN select ARCH_MAY_HAVE_PC_FDC select ARCH_SPARSEMEM_ENABLE @@ -380,6 +382,7 @@ config ARCH_RPC config ARCH_SA1100 bool "SA1100-based" depends on CPU_LITTLE_ENDIAN + depends on ATAGS select ARCH_MTD_XIP select ARCH_SPARSEMEM_ENABLE select CLKSRC_MMIO @@ -1539,7 +1542,7 @@ config USE_OF Include support for flattened device tree machine descriptions. config ATAGS - bool "Support for the traditional ATAGS boot data passing" if USE_OF + bool "Support for the traditional ATAGS boot data passing" default y help This is the traditional way of passing data to the kernel at boot diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig index 1ecf5466931e..622f3cf28c68 100644 --- a/arch/arm/mach-cns3xxx/Kconfig +++ b/arch/arm/mach-cns3xxx/Kconfig @@ -2,6 +2,7 @@ menuconfig ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" depends on ARCH_MULTI_V6 + depends on ATAGS select ARM_GIC help Support for Cavium Networks CNS3XXX platform. diff --git a/arch/arm/mach-dove/Kconfig b/arch/arm/mach-dove/Kconfig index c30c69c664ea..b2bb2162e31c 100644 --- a/arch/arm/mach-dove/Kconfig +++ b/arch/arm/mach-dove/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 menuconfig ARCH_DOVE bool "Marvell Dove" if ARCH_MULTI_V7 + depends on ATAGS select CPU_PJ4 select GPIOLIB select MVEBU_MBUS diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig index 21f4cc2ba651..ecac8b487dae 100644 --- a/arch/arm/mach-ep93xx/Kconfig +++ b/arch/arm/mach-ep93xx/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig ARCH_EP93XX bool "EP93xx-based" + depends on ATAGS depends on ARCH_MULTI_V4T depends on CPU_LITTLE_ENDIAN select ARCH_SPARSEMEM_ENABLE diff --git a/arch/arm/mach-iop32x/Kconfig b/arch/arm/mach-iop32x/Kconfig index 01f60a8e6404..142c6374543c 100644 --- a/arch/arm/mach-iop32x/Kconfig +++ b/arch/arm/mach-iop32x/Kconfig @@ -3,6 +3,7 @@ menuconfig ARCH_IOP32X bool "IOP32x-based platforms" depends on ARCH_MULTI_V5 depends on CPU_LITTLE_ENDIAN + depends on ATAGS select CPU_XSCALE select GPIO_IOP select GPIOLIB diff --git a/arch/arm/mach-mv78xx0/Kconfig b/arch/arm/mach-mv78xx0/Kconfig index f0276f0d1102..21624107296a 100644 --- a/arch/arm/mach-mv78xx0/Kconfig +++ b/arch/arm/mach-mv78xx0/Kconfig @@ -3,6 +3,7 @@ menuconfig ARCH_MV78XX0 bool "Marvell MV78xx0" depends on ARCH_MULTI_V5 depends on CPU_LITTLE_ENDIAN + depends on ATAGS select CPU_FEROCEON select GPIOLIB select MVEBU_MBUS diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index 0ac0567f721d..cbeb2b3ba86e 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig @@ -3,6 +3,7 @@ menuconfig ARCH_OMAP1 bool "TI OMAP1" depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 depends on CPU_LITTLE_ENDIAN + depends on ATAGS select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_OMAP select CLKSRC_MMIO diff --git a/arch/arm/mach-s3c/Kconfig.s3c24xx b/arch/arm/mach-s3c/Kconfig.s3c24xx index 662c5aec2ea3..88a5a333312a 100644 --- a/arch/arm/mach-s3c/Kconfig.s3c24xx +++ b/arch/arm/mach-s3c/Kconfig.s3c24xx @@ -8,7 +8,7 @@ menuconfig ARCH_S3C24XX bool "Samsung S3C24XX SoCs (deprecated, see help)" depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 depends on CPU_LITTLE_ENDIAN - select ATAGS + depends on ATAGS select CLKSRC_SAMSUNG_PWM select GPIO_SAMSUNG select GPIOLIB -- cgit v1.2.3-58-ga151 From acb926d618f252a8fec2424662fa201d07e66338 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 14:30:21 +0200 Subject: ARM: add CONFIG_UNUSED_BOARD_FILES Based on the recent mailing list discussion, most board file support has no remaining users and can be scheduled for removal early next year. If a board is still found to have users, it will remain for this round but users are encouraged to migrate to devicetree based booting where possible. The timing is meant to ensure the next longterm supported kernel still contains all the board files, giving another year of support for potential users that did not speak up and would otherwise be stuck on the v5.15.y longterm kernel from 2021. Link: https://lore.kernel.org/all/CAK8P3a0Z9vGEQbVRBo84bSyPFM-LF+hs5w8ZA51g2Z+NsdtDQA@mail.gmail.com/ Link: https://docs.google.com/spreadsheets/d/1PL4dUUSieeXHzZhAn_Rnix32OTiCfN33sCQejpvI6ng/edit#gid=0 Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4349525cd1e1..6307a66ff6fe 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1548,8 +1548,20 @@ config ATAGS This is the traditional way of passing data to the kernel at boot time. If you are solely relying on the flattened device tree (or the ARM_ATAG_DTB_COMPAT option) then you may unselect this option - to remove ATAGS support from your kernel binary. If unsure, - leave this to y. + to remove ATAGS support from your kernel binary. + +config UNUSED_BOARD_FILES + bool "Board support for machines without known users" + depends on ATAGS + help + Most ATAGS based board files are completely unused and are + scheduled for removal in early 2023, and left out of kernels + by default now. If you are using a board file that is marked + as unused, turn on this option to build support into the kernel. + + To keep support for your individual board from being removed, + send a reply to the email discussion at + https://lore.kernel.org/all/CAK8P3a0Z9vGEQbVRBo84bSyPFM-LF+hs5w8ZA51g2Z+NsdtDQA@mail.gmail.com/ config DEPRECATED_PARAM_STRUCT bool "Provide old way to pass kernel parameters" -- cgit v1.2.3-58-ga151 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 v1.2.3-58-ga151 From 0c00a537bc399382a7039fd972fdd0d6a5d706e3 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 17:54:15 +0200 Subject: ARM: orion: add ATAGS dependencies Most of the remaining arm board files in the kernel are unused and will be removed in early 2023 if no users step up. So far I got no user replies about the orion5x and mv78xx0 machines, but these are still supported in the default kernel of the Debian 'armel' (armv5 softfloat) distro, and there is an active project on github that tries to keep some of these machines working, and Mauri Sandberg is working on a DT conversion for the D-Link DNS-323. It appears the Debian-on-Buffalo project has not got the Terastation WXL working in a few years, and the other mv78xx0 machines are just the reference designs, so I assume none of these have remaining users. For the Orion5x family, the same is probably true for its reference implementations (RD88Fxxxxx, DB88F281) and the machines with less than 64MB of memory (WNR854T, WRT350N v2). The remaining nine machines are now scheduled to be kept for at least 2023, hopefully to be replaced with DT based versions. The mv78xx0_defconfig file needs to enable CONFIG_UNUSED_BOARD_FILES to still build, while the other affected defconfig files lose the specific boards. Cc: Andrew Lunn Cc: Sebastian Hesselbarth Cc: Gregory Clement Cc: Mauri Sandberg Link: https://github.com/1000001101000/Debian_on_Buffalo Signed-off-by: Arnd Bergmann --- arch/arm/configs/multi_v5_defconfig | 8 -------- arch/arm/configs/mv78xx0_defconfig | 1 + arch/arm/configs/mvebu_v5_defconfig | 8 -------- arch/arm/configs/orion5x_defconfig | 13 ------------- arch/arm/mach-mv78xx0/Kconfig | 2 +- arch/arm/mach-orion5x/Kconfig | 17 +++++++++++++++++ 6 files changed, 19 insertions(+), 30 deletions(-) diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig index c6dc1509bc77..794c7a177594 100644 --- a/arch/arm/configs/multi_v5_defconfig +++ b/arch/arm/configs/multi_v5_defconfig @@ -31,8 +31,6 @@ CONFIG_MACH_KIRKWOOD=y CONFIG_ARCH_NPCM=y CONFIG_ARCH_WPCM450=y CONFIG_ARCH_ORION5X=y -CONFIG_MACH_DB88F5281=y -CONFIG_MACH_RD88F5182=y CONFIG_MACH_RD88F5182_DT=y CONFIG_MACH_KUROBOX_PRO=y CONFIG_MACH_DNS323=y @@ -40,18 +38,12 @@ CONFIG_MACH_TS209=y CONFIG_MACH_TERASTATION_PRO2=y CONFIG_MACH_LINKSTATION_PRO=y CONFIG_MACH_LINKSTATION_MINI=y -CONFIG_MACH_LINKSTATION_LS_HGL=y CONFIG_MACH_TS409=y -CONFIG_MACH_WRT350N_V2=y CONFIG_MACH_TS78XX=y CONFIG_MACH_MV2120=y CONFIG_MACH_D2NET_DT=y CONFIG_MACH_NET2BIG=y CONFIG_MACH_MSS2_DT=y -CONFIG_MACH_WNR854T=y -CONFIG_MACH_RD88F5181L_GE=y -CONFIG_MACH_RD88F5181L_FXO=y -CONFIG_MACH_RD88F6183AP_GE=y CONFIG_ARCH_SUNXI=y CONFIG_ARCH_VERSATILE=y CONFIG_AEABI=y diff --git a/arch/arm/configs/mv78xx0_defconfig b/arch/arm/configs/mv78xx0_defconfig index 89699b015396..a53ccd49f8ff 100644 --- a/arch/arm/configs/mv78xx0_defconfig +++ b/arch/arm/configs/mv78xx0_defconfig @@ -17,6 +17,7 @@ CONFIG_MACH_TERASTATION_WXL=y CONFIG_AEABI=y CONFIG_HIGHMEM=y CONFIG_FPE_NWFPE=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_VFP=y CONFIG_KPROBES=y CONFIG_MODULES=y diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig index 456457fa7d16..ef3a33ebc29a 100644 --- a/arch/arm/configs/mvebu_v5_defconfig +++ b/arch/arm/configs/mvebu_v5_defconfig @@ -9,8 +9,6 @@ CONFIG_PROFILING=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_KIRKWOOD=y CONFIG_ARCH_ORION5X=y -CONFIG_MACH_DB88F5281=y -CONFIG_MACH_RD88F5182=y CONFIG_MACH_RD88F5182_DT=y CONFIG_MACH_KUROBOX_PRO=y CONFIG_MACH_DNS323=y @@ -19,18 +17,12 @@ CONFIG_MACH_TERASTATION_PRO2=y CONFIG_MACH_LINKSTATION_PRO=y CONFIG_MACH_LINKSTATION_LSCHL=y CONFIG_MACH_LINKSTATION_MINI=y -CONFIG_MACH_LINKSTATION_LS_HGL=y CONFIG_MACH_TS409=y -CONFIG_MACH_WRT350N_V2=y CONFIG_MACH_TS78XX=y CONFIG_MACH_MV2120=y CONFIG_MACH_D2NET_DT=y CONFIG_MACH_NET2BIG=y CONFIG_MACH_MSS2_DT=y -CONFIG_MACH_WNR854T=y -CONFIG_MACH_RD88F5181L_GE=y -CONFIG_MACH_RD88F5181L_FXO=y -CONFIG_MACH_RD88F6183AP_GE=y CONFIG_AEABI=y CONFIG_HIGHMEM=y CONFIG_ARM_APPENDED_DTB=y diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig index e3e97eea8cec..1311d9583fcc 100644 --- a/arch/arm/configs/orion5x_defconfig +++ b/arch/arm/configs/orion5x_defconfig @@ -9,9 +9,6 @@ CONFIG_ARCH_MULTI_V5=y # CONFIG_ARCH_MULTI_V6 is not set # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_ORION5X=y -CONFIG_ARCH_ORION5X_DT=y -CONFIG_MACH_DB88F5281=y -CONFIG_MACH_RD88F5182=y CONFIG_MACH_RD88F5182_DT=y CONFIG_MACH_KUROBOX_PRO=y CONFIG_MACH_DNS323=y @@ -19,20 +16,10 @@ CONFIG_MACH_TS209=y CONFIG_MACH_TERASTATION_PRO2=y CONFIG_MACH_LINKSTATION_PRO=y CONFIG_MACH_LINKSTATION_MINI=y -CONFIG_MACH_LINKSTATION_LS_HGL=y CONFIG_MACH_TS409=y -CONFIG_MACH_WRT350N_V2=y CONFIG_MACH_TS78XX=y CONFIG_MACH_MV2120=y -CONFIG_MACH_EDMINI_V2_DT=y -CONFIG_MACH_D2NET=y -CONFIG_MACH_BIGDISK=y CONFIG_MACH_NET2BIG=y -CONFIG_MACH_MSS2=y -CONFIG_MACH_WNR854T=y -CONFIG_MACH_RD88F5181L_GE=y -CONFIG_MACH_RD88F5181L_FXO=y -CONFIG_MACH_RD88F6183AP_GE=y CONFIG_AEABI=y CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y diff --git a/arch/arm/mach-mv78xx0/Kconfig b/arch/arm/mach-mv78xx0/Kconfig index 21624107296a..da92f94494cc 100644 --- a/arch/arm/mach-mv78xx0/Kconfig +++ b/arch/arm/mach-mv78xx0/Kconfig @@ -3,7 +3,7 @@ menuconfig ARCH_MV78XX0 bool "Marvell MV78xx0" depends on ARCH_MULTI_V5 depends on CPU_LITTLE_ENDIAN - depends on ATAGS + depends on ATAGS && UNUSED_BOARD_FILES select CPU_FEROCEON select GPIOLIB select MVEBU_MBUS diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig index bf833b51931d..5a980684b50d 100644 --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig @@ -30,6 +30,7 @@ config ARCH_ORION5X_DT config MACH_DB88F5281 bool "Marvell Orion-2 Development Board" select I2C_BOARDINFO if I2C + depends on ATAGS && UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Marvell Orion-2 (88F5281) Development Board @@ -37,6 +38,7 @@ config MACH_DB88F5281 config MACH_RD88F5182 bool "Marvell Orion-NAS Reference Design" select I2C_BOARDINFO if I2C + depends on ATAGS && UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Marvell Orion-NAS (88F5182) RD2 @@ -52,6 +54,7 @@ config MACH_RD88F5182_DT config MACH_KUROBOX_PRO bool "KuroBox Pro" select I2C_BOARDINFO if I2C + depends on ATAGS help Say 'Y' here if you want your kernel to support the KuroBox Pro platform. @@ -59,24 +62,28 @@ config MACH_KUROBOX_PRO config MACH_DNS323 bool "D-Link DNS-323" select I2C_BOARDINFO if I2C + depends on ATAGS help Say 'Y' here if you want your kernel to support the D-Link DNS-323 platform. config MACH_TS209 bool "QNAP TS-109/TS-209" + depends on ATAGS help Say 'Y' here if you want your kernel to support the QNAP TS-109/TS-209 platform. config MACH_TERASTATION_PRO2 bool "Buffalo Terastation Pro II/Live" + depends on ATAGS help Say 'Y' here if you want your kernel to support the Buffalo Terastation Pro II/Live platform. config MACH_LINKSTATION_PRO bool "Buffalo Linkstation Pro/Live" + depends on ATAGS select I2C_BOARDINFO if I2C help Say 'Y' here if you want your kernel to support the @@ -92,6 +99,7 @@ config MACH_LINKSTATION_MINI config MACH_LINKSTATION_LS_HGL bool "Buffalo Linkstation LS-HGL" + depends on ATAGS && UNUSED_BOARD_FILES select I2C_BOARDINFO if I2C help Say 'Y' here if you want your kernel to support the @@ -99,24 +107,28 @@ config MACH_LINKSTATION_LS_HGL config MACH_TS409 bool "QNAP TS-409" + depends on ATAGS help Say 'Y' here if you want your kernel to support the QNAP TS-409 platform. config MACH_WRT350N_V2 bool "Linksys WRT350N v2" + depends on ATAGS && UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Linksys WRT350N v2 platform. config MACH_TS78XX bool "Technologic Systems TS-78xx" + depends on ATAGS help Say 'Y' here if you want your kernel to support the Technologic Systems TS-78xx platform. config MACH_MV2120 bool "HP Media Vault mv2120" + depends on ATAGS help Say 'Y' here if you want your kernel to support the HP Media Vault mv2120 or mv5100. @@ -130,6 +142,7 @@ config MACH_D2NET_DT config MACH_NET2BIG bool "LaCie 2Big Network" + depends on ATAGS select I2C_BOARDINFO if I2C help Say 'Y' here if you want your kernel to support the @@ -144,24 +157,28 @@ config MACH_MSS2_DT config MACH_WNR854T bool "Netgear WNR854T" + depends on ATAGS && UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Netgear WNR854T platform. config MACH_RD88F5181L_GE bool "Marvell Orion-VoIP GE Reference Design" + depends on ATAGS && UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Marvell Orion-VoIP GE (88F5181L) RD. config MACH_RD88F5181L_FXO bool "Marvell Orion-VoIP FXO Reference Design" + depends on ATAGS && UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Marvell Orion-VoIP FXO (88F5181L) RD. config MACH_RD88F6183AP_GE bool "Marvell Orion-1-90 AP GE Reference Design" + depends on ATAGS && UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Marvell Orion-1-90 (88F6183) AP GE RD. -- cgit v1.2.3-58-ga151 From 3c1ca64f52032316429bc23c6330e3f384b2d4bb Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 18:06:20 +0200 Subject: ARM: davinci: mark all ATAGS board files as unused From an earlier discussion, it appears that the davinci da8xx machines that are still functional have already been converted to DT, while the remaining board files are only kept because nobody has stepped up to remove them. Mark all these boards as 'depends on UNUSED_BOARD_FILES' with the plan to remove them in early 2023 after the next longterm supported kernel is out. Cc: Sekhar Nori Cc: Bartosz Golaszewski Signed-off-by: Arnd Bergmann --- arch/arm/configs/davinci_all_defconfig | 11 ----------- arch/arm/configs/multi_v5_defconfig | 9 --------- arch/arm/mach-davinci/Kconfig | 8 ++++++++ 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index c60c39a8b95f..fc71a03a9c8c 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -14,17 +14,8 @@ CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MULTI_V5=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_DAVINCI=y -CONFIG_ARCH_DAVINCI_DM644x=y -CONFIG_ARCH_DAVINCI_DM355=y -CONFIG_ARCH_DAVINCI_DM646x=y CONFIG_ARCH_DAVINCI_DA830=y CONFIG_ARCH_DAVINCI_DA850=y -CONFIG_ARCH_DAVINCI_DM365=y -CONFIG_MACH_SFFSDR=y -CONFIG_MACH_NEUROS_OSD2=y -CONFIG_MACH_DM355_LEOPARD=y -CONFIG_MACH_MITYOMAPL138=y -CONFIG_MACH_OMAPL138_HAWKBOARD=y CONFIG_DAVINCI_MUX_DEBUG=y CONFIG_DAVINCI_MUX_WARNINGS=y CONFIG_AEABI=y @@ -110,7 +101,6 @@ CONFIG_KEYBOARD_XTKBD=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_MISC=y CONFIG_INPUT_PWM_BEEPER=m -CONFIG_INPUT_DM355EVM=m CONFIG_SERIO_LIBPS2=y # CONFIG_VT_CONSOLE is not set CONFIG_SERIAL_8250=y @@ -138,7 +128,6 @@ CONFIG_SYSCON_REBOOT_MODE=m CONFIG_BATTERY_LEGO_EV3=m CONFIG_WATCHDOG=y CONFIG_DAVINCI_WATCHDOG=y -CONFIG_MFD_DM355EVM_MSP=y CONFIG_TPS6507X=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig index 794c7a177594..e0be0e0023f3 100644 --- a/arch/arm/configs/multi_v5_defconfig +++ b/arch/arm/configs/multi_v5_defconfig @@ -12,17 +12,8 @@ CONFIG_MACH_ASPEED_G4=y CONFIG_ARCH_AT91=y CONFIG_SOC_AT91SAM9=y CONFIG_ARCH_DAVINCI=y -CONFIG_ARCH_DAVINCI_DM644x=y -CONFIG_ARCH_DAVINCI_DM355=y -CONFIG_ARCH_DAVINCI_DM646x=y CONFIG_ARCH_DAVINCI_DA830=y CONFIG_ARCH_DAVINCI_DA850=y -CONFIG_ARCH_DAVINCI_DM365=y -CONFIG_MACH_SFFSDR=y -CONFIG_MACH_NEUROS_OSD2=y -CONFIG_MACH_DM355_LEOPARD=y -CONFIG_MACH_MITYOMAPL138=y -CONFIG_MACH_OMAPL138_HAWKBOARD=y CONFIG_ARCH_MXC=y CONFIG_SOC_IMX25=y CONFIG_SOC_IMX27=y diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 008cbc2ab867..d7b6990954f4 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -26,6 +26,7 @@ config ARCH_DAVINCI_DM644x config ARCH_DAVINCI_DM355 bool "DaVinci 355 based system" + depends on ATAGS && UNUSED_BOARD_FILES select DAVINCI_AINTC select ARCH_DAVINCI_DMx @@ -37,6 +38,7 @@ config ARCH_DAVINCI_DM646x config ARCH_DAVINCI_DA830 bool "DA830/OMAP-L137/AM17x based system" depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT) + depends on ATAGS select ARCH_DAVINCI_DA8XX # needed on silicon revs 1.0, 1.1: select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE @@ -45,6 +47,7 @@ config ARCH_DAVINCI_DA830 config ARCH_DAVINCI_DA850 bool "DA850/OMAP-L138/AM18x based system" depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT) + depends on ATAGS select ARCH_DAVINCI_DA8XX select DAVINCI_CP_INTC @@ -53,6 +56,7 @@ config ARCH_DAVINCI_DA8XX config ARCH_DAVINCI_DM365 bool "DaVinci 365 based system" + depends on ATAGS && UNUSED_BOARD_FILES select DAVINCI_AINTC select ARCH_DAVINCI_DMx @@ -127,6 +131,7 @@ config MACH_DAVINCI_DM365_EVM config MACH_DAVINCI_DA830_EVM bool "TI DA830/OMAP-L137/AM17x Reference Platform" default ARCH_DAVINCI_DA830 + depends on ATAGS && UNUSED_BOARD_FILES depends on ARCH_DAVINCI_DA830 select GPIO_PCF857X if I2C help @@ -156,6 +161,7 @@ endchoice config MACH_DAVINCI_DA850_EVM bool "TI DA850/OMAP-L138/AM18x Reference Platform" + depends on ATAGS && UNUSED_BOARD_FILES default ARCH_DAVINCI_DA850 depends on ARCH_DAVINCI_DA850 help @@ -197,6 +203,7 @@ endchoice config MACH_MITYOMAPL138 bool "Critical Link MityDSP-L138/MityARM-1808 SoM" depends on ARCH_DAVINCI_DA850 + depends on ATAGS && UNUSED_BOARD_FILES help Say Y here to select the Critical Link MityDSP-L138/MityARM-1808 System on Module. Information on this SoM may be found at @@ -205,6 +212,7 @@ config MACH_MITYOMAPL138 config MACH_OMAPL138_HAWKBOARD bool "TI AM1808 / OMAPL-138 Hawkboard platform" depends on ARCH_DAVINCI_DA850 + depends on ATAGS && UNUSED_BOARD_FILES help Say Y here to select the TI AM1808 / OMAPL-138 Hawkboard platform . -- cgit v1.2.3-58-ga151 From 6eea15887f38b0b49beb05aa0d75e854b593e967 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 18:09:30 +0200 Subject: ARM: ep93xx: mark most board files as unused Most of the remaining ARM board files in the kernel have no known users, and we plan to remove those in early 2023. For ep93xx, Alexander Sverdlin still has access to the edb93xx family of reference boards, while Nikita Shubin has a ts7250 and is working on a device tree conversion for those. Hartley Sweeten has a MACH_VISION_EP9307 that is still in use. This is a total of nine machine definitions that we will keep around, but these are all similar machines and are defined in only two board files. The other six board files now have a dependency on CONFIG_UNUSED_BOARD_FILES to indicate that they are likely going away. Cc: Nikita Shubin Acked-by: Alexander Sverdlin Cc: Hartley Sweeten Cc: Lukasz Majewski Signed-off-by: Arnd Bergmann --- arch/arm/configs/ep93xx_defconfig | 8 -------- arch/arm/mach-ep93xx/Kconfig | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig index dd390f3b19d2..3154125321c5 100644 --- a/arch/arm/configs/ep93xx_defconfig +++ b/arch/arm/configs/ep93xx_defconfig @@ -8,7 +8,6 @@ CONFIG_EXPERT=y CONFIG_ARCH_MULTI_V4T=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_EP93XX=y -CONFIG_MACH_ADSSPHERE=y CONFIG_MACH_EDB9301=y CONFIG_MACH_EDB9302=y CONFIG_MACH_EDB9302A=y @@ -17,13 +16,6 @@ CONFIG_MACH_EDB9307A=y CONFIG_MACH_EDB9312=y CONFIG_MACH_EDB9315=y CONFIG_MACH_EDB9315A=y -CONFIG_MACH_GESBC9312=y -CONFIG_MACH_MICRO9H=y -CONFIG_MACH_MICRO9M=y -CONFIG_MACH_MICRO9L=y -CONFIG_MACH_MICRO9S=y -CONFIG_MACH_SIM_ONE=y -CONFIG_MACH_SNAPPER_CL15=y CONFIG_MACH_TS72XX=y CONFIG_MACH_VISION_EP9307=y CONFIG_AEABI=y diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig index ecac8b487dae..2c40996a444b 100644 --- a/arch/arm/mach-ep93xx/Kconfig +++ b/arch/arm/mach-ep93xx/Kconfig @@ -27,6 +27,7 @@ comment "EP93xx Platforms" config MACH_ADSSPHERE bool "Support ADS Sphere" + depends on UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the ADS Sphere board. @@ -99,6 +100,7 @@ config MACH_EDB9315A config MACH_GESBC9312 bool "Support Glomation GESBC-9312-sx" + depends on UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Glomation GESBC-9312-sx board. @@ -109,6 +111,7 @@ config MACH_MICRO9 config MACH_MICRO9H bool "Support Contec Micro9-High" select MACH_MICRO9 + depends on UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Contec Micro9-High board. @@ -116,6 +119,7 @@ config MACH_MICRO9H config MACH_MICRO9M bool "Support Contec Micro9-Mid" select MACH_MICRO9 + depends on UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Contec Micro9-Mid board. @@ -123,6 +127,7 @@ config MACH_MICRO9M config MACH_MICRO9L bool "Support Contec Micro9-Lite" select MACH_MICRO9 + depends on UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Contec Micro9-Lite board. @@ -130,18 +135,21 @@ config MACH_MICRO9L config MACH_MICRO9S bool "Support Contec Micro9-Slim" select MACH_MICRO9 + depends on UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Contec Micro9-Slim board. config MACH_SIM_ONE bool "Support Simplemachines Sim.One board" + depends on UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Simplemachines Sim.One board. config MACH_SNAPPER_CL15 bool "Support Bluewater Systems Snapper CL15 Module" + depends on UNUSED_BOARD_FILES help Say 'Y' here if you want your kernel to support the Bluewater Systems Snapper CL15 Module. -- cgit v1.2.3-58-ga151 From 60e3eabca49c25bae8896eb094c70b46aa0d2a0f Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 20:15:01 +0200 Subject: ARM: mmp: mark all board files for removal The mmp platform supports both ATAGS based board files and DT booting, but it appears that nobody has been interested in board files for a long time. Mark all of them for removal in early 2023 with a dependency on CONFIG_UNUSED_BOARD_FILES, leaving only the DT support for the future, unless someone pops up who uses them. Cc: Lubomir Rintel Cc: Haojian Zhuang Signed-off-by: Arnd Bergmann --- arch/arm/configs/mmp2_defconfig | 5 ++--- arch/arm/mach-mmp/Kconfig | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/mmp2_defconfig b/arch/arm/configs/mmp2_defconfig index 1b6b41a36888..4d39c615117b 100644 --- a/arch/arm/configs/mmp2_defconfig +++ b/arch/arm/configs/mmp2_defconfig @@ -5,10 +5,8 @@ CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_BLK_DEV_BSG is not set CONFIG_ARCH_MMP=y -CONFIG_MACH_BROWNSTONE=y -CONFIG_MACH_FLINT=y -CONFIG_MACH_MARVELL_JASPER=y CONFIG_AEABI=y +CONFIG_MACH_MMP2_DT=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=ttyS2,38400 mem=128M user_debug=255 earlyprintk" CONFIG_VFP=y CONFIG_MODULES=y @@ -56,6 +54,7 @@ CONFIG_BACKLIGHT_MAX8925=y CONFIG_MMC=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_MAX8925=y +# CONFIG_RESET_CONTROLLER is not set CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS=y diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig index 333229c65b28..d71417d57961 100644 --- a/arch/arm/mach-mmp/Kconfig +++ b/arch/arm/mach-mmp/Kconfig @@ -18,6 +18,7 @@ if ATAGS config MACH_ASPENITE bool "Marvell's PXA168 Aspenite Development Board" depends on ARCH_MULTI_V5 + depends on UNUSED_BOARD_FILES select CPU_PXA168 help Say 'Y' here if you want to support the Marvell PXA168-based @@ -26,6 +27,7 @@ config MACH_ASPENITE config MACH_ZYLONITE2 bool "Marvell's PXA168 Zylonite2 Development Board" depends on ARCH_MULTI_V5 + depends on UNUSED_BOARD_FILES select CPU_PXA168 help Say 'Y' here if you want to support the Marvell PXA168-based @@ -34,6 +36,7 @@ config MACH_ZYLONITE2 config MACH_AVENGERS_LITE bool "Marvell's PXA168 Avengers Lite Development Board" depends on ARCH_MULTI_V5 + depends on UNUSED_BOARD_FILES select CPU_PXA168 help Say 'Y' here if you want to support the Marvell PXA168-based @@ -42,6 +45,7 @@ config MACH_AVENGERS_LITE config MACH_TTC_DKB bool "Marvell's PXA910 TavorEVB/TTC_DKB Development Board" depends on ARCH_MULTI_V5 + depends on UNUSED_BOARD_FILES select CPU_PXA910 help Say 'Y' here if you want to support the Marvell PXA910-based @@ -50,6 +54,7 @@ config MACH_TTC_DKB config MACH_BROWNSTONE bool "Marvell's Brownstone Development Platform" depends on ARCH_MULTI_V7 + depends on UNUSED_BOARD_FILES select CPU_MMP2 help Say 'Y' here if you want to support the Marvell MMP2-based @@ -61,6 +66,7 @@ config MACH_BROWNSTONE config MACH_FLINT bool "Marvell's Flint Development Platform" depends on ARCH_MULTI_V7 + depends on UNUSED_BOARD_FILES select CPU_MMP2 help Say 'Y' here if you want to support the Marvell MMP2-based @@ -72,6 +78,7 @@ config MACH_FLINT config MACH_MARVELL_JASPER bool "Marvell's Jasper Development Platform" depends on ARCH_MULTI_V7 + depends on UNUSED_BOARD_FILES select CPU_MMP2 help Say 'Y' here if you want to support the Marvell MMP2-base @@ -83,6 +90,7 @@ config MACH_MARVELL_JASPER config MACH_TETON_BGA bool "Marvell's PXA168 Teton BGA Development Board" depends on ARCH_MULTI_V5 + depends on UNUSED_BOARD_FILES select CPU_PXA168 help Say 'Y' here if you want to support the Marvell PXA168-based @@ -91,6 +99,7 @@ config MACH_TETON_BGA config MACH_GPLUGD bool "Marvell's PXA168 GuruPlug Display (gplugD) Board" depends on ARCH_MULTI_V5 + depends on UNUSED_BOARD_FILES select CPU_PXA168 help Say 'Y' here if you want to support the Marvell PXA168-based -- cgit v1.2.3-58-ga151 From bdd50bf19b68749cce62300a9c296dffbac0d41d Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 20:37:09 +0200 Subject: ARM: footbridge: mark cats board for removal There are three remaining footbridge boards, as the CO285 and the HP personal server got removed already over the years. Russell still uses his ebsa285, while both Linus and Marc have a NetWinder that they use for testing. Nobody so far replied that they are using cats, so it goes on the long list of machines to be removed in early 2023 if it stays like this. Cc: Russell King Cc: Linus Walleij Cc: Marc Zyngier Signed-off-by: Arnd Bergmann --- arch/arm/configs/footbridge_defconfig | 1 - arch/arm/mach-footbridge/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/configs/footbridge_defconfig b/arch/arm/configs/footbridge_defconfig index 5c0c88ce9bc5..504070812ad0 100644 --- a/arch/arm/configs/footbridge_defconfig +++ b/arch/arm/configs/footbridge_defconfig @@ -5,7 +5,6 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_EXPERT=y # CONFIG_HOTPLUG is not set CONFIG_ARCH_FOOTBRIDGE=y -CONFIG_ARCH_CATS=y CONFIG_ARCH_EBSA285_HOST=y CONFIG_ARCH_NETWINDER=y CONFIG_FPE_NWFPE=y diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig index 728aff93fba9..bcd4e4ca34f7 100644 --- a/arch/arm/mach-footbridge/Kconfig +++ b/arch/arm/mach-footbridge/Kconfig @@ -5,6 +5,7 @@ menu "Footbridge Implementations" config ARCH_CATS bool "CATS" + depends on UNUSED_BOARD_FILES select CLKEVT_I8253 select CLKSRC_I8253 select FOOTBRIDGE_HOST -- cgit v1.2.3-58-ga151 From 336291304692faf1449c4fe9087bec73bcf188ec Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 21:26:45 +0200 Subject: ARM: sa1100: mark most boards as unused Most Arm board files are unused and will be removed in early 2023 if no remaining users show up. For the sa1100 platform, the machines that are still in use are: - Russell's Assabet development board - Linus' H3600 iPaq PocketPC - Collie as the only qemu-supported board, to allow testing by others All remaining sa1100 boards are marked to depend on CONFIG_UNUSED_BOARD_FILES to give potential users a last chance to speak up. Cc: Kristoffer Ericson Cc: Russell King Acked-by: Linus Walleij Signed-off-by: Arnd Bergmann --- arch/arm/configs/badge4_defconfig | 1 + arch/arm/configs/cerfcube_defconfig | 1 + arch/arm/configs/hackkit_defconfig | 1 + arch/arm/configs/jornada720_defconfig | 1 + arch/arm/configs/lart_defconfig | 1 + arch/arm/configs/pleb_defconfig | 1 + arch/arm/configs/shannon_defconfig | 1 + arch/arm/configs/simpad_defconfig | 1 + arch/arm/mach-sa1100/Kconfig | 11 +++++++++++ 9 files changed, 19 insertions(+) diff --git a/arch/arm/configs/badge4_defconfig b/arch/arm/configs/badge4_defconfig index 179788073afd..506f3378da07 100644 --- a/arch/arm/configs/badge4_defconfig +++ b/arch/arm/configs/badge4_defconfig @@ -2,6 +2,7 @@ CONFIG_LOG_BUF_SHIFT=14 CONFIG_EXPERT=y 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 diff --git a/arch/arm/configs/cerfcube_defconfig b/arch/arm/configs/cerfcube_defconfig index d4f3f9a8cd97..7e6f7dfa3023 100644 --- a/arch/arm/configs/cerfcube_defconfig +++ b/arch/arm/configs/cerfcube_defconfig @@ -4,6 +4,7 @@ CONFIG_LOG_BUF_SHIFT=14 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 diff --git a/arch/arm/configs/hackkit_defconfig b/arch/arm/configs/hackkit_defconfig index 19bc294c2767..b9327b2eacd3 100644 --- a/arch/arm/configs/hackkit_defconfig +++ b/arch/arm/configs/hackkit_defconfig @@ -3,6 +3,7 @@ CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y CONFIG_ARCH_SA1100=y CONFIG_SA1100_HACKKIT=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="console=ttySA0,115200 root=/dev/ram0 initrd=0xc0400000,8M init=/rootshell" CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_FPE_NWFPE=y diff --git a/arch/arm/configs/jornada720_defconfig b/arch/arm/configs/jornada720_defconfig index d9e2551ac31d..3dcf89d3e1f1 100644 --- a/arch/arm/configs/jornada720_defconfig +++ b/arch/arm/configs/jornada720_defconfig @@ -4,6 +4,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_ARCH_SA1100=y CONFIG_SA1100_JORNADA720=y CONFIG_SA1100_JORNADA720_SSP=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_FPE_NWFPE=y CONFIG_BINFMT_AOUT=y CONFIG_PM=y diff --git a/arch/arm/configs/lart_defconfig b/arch/arm/configs/lart_defconfig index 3dad6adabb43..0c2f19d756c0 100644 --- a/arch/arm/configs/lart_defconfig +++ b/arch/arm/configs/lart_defconfig @@ -3,6 +3,7 @@ CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y CONFIG_ARCH_SA1100=y CONFIG_SA1100_LART=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="console=ttySA0,9600 root=/dev/ram" CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y diff --git a/arch/arm/configs/pleb_defconfig b/arch/arm/configs/pleb_defconfig index e109d8784b10..d87263336cb2 100644 --- a/arch/arm/configs/pleb_defconfig +++ b/arch/arm/configs/pleb_defconfig @@ -6,6 +6,7 @@ CONFIG_EXPERT=y # CONFIG_SHMEM is not set CONFIG_ARCH_SA1100=y CONFIG_SA1100_PLEB=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="console=ttySA0,9600 mem=16M@0xc0000000 mem=16M@0xc8000000 root=/dev/ram initrd=0xc0400000,4M" CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y diff --git a/arch/arm/configs/shannon_defconfig b/arch/arm/configs/shannon_defconfig index feaec5405576..42252e85ee49 100644 --- a/arch/arm/configs/shannon_defconfig +++ b/arch/arm/configs/shannon_defconfig @@ -3,6 +3,7 @@ CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y CONFIG_ARCH_SA1100=y CONFIG_SA1100_SHANNON=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="console=ttySA0,9600 console=tty1 root=/dev/mtdblock2 init=/linuxrc" CONFIG_FPE_NWFPE=y CONFIG_MODULES=y diff --git a/arch/arm/configs/simpad_defconfig b/arch/arm/configs/simpad_defconfig index 7956f0da0bf9..cc451728f6d9 100644 --- a/arch/arm/configs/simpad_defconfig +++ b/arch/arm/configs/simpad_defconfig @@ -7,6 +7,7 @@ CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_ARCH_SA1100=y CONFIG_SA1100_SIMPAD=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="mtdparts=sa1100:512k(boot),1m(kernel),-(root) console=ttySA0 root=1f02 noinitrd mem=64M jffs2_orphaned_inodes=delete rootfstype=jffs2" CONFIG_FPE_NWFPE=y CONFIG_MODULES=y diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig index 66e79fa9ba2b..7e0161cb1c1f 100644 --- a/arch/arm/mach-sa1100/Kconfig +++ b/arch/arm/mach-sa1100/Kconfig @@ -25,6 +25,7 @@ config ASSABET_NEPONSET config SA1100_CERF bool "CerfBoard" + depends on UNUSED_BOARD_FILES select ARM_SA1110_CPUFREQ select LEDS_GPIO_REGISTER help @@ -62,6 +63,7 @@ config SA1100_COLLIE config SA1100_H3100 bool "Compaq iPAQ H3100" + depends on UNUSED_BOARD_FILES select ARM_SA1110_CPUFREQ select HTC_EGPIO select MFD_IPAQ_MICRO @@ -80,6 +82,7 @@ config SA1100_H3600 config SA1100_BADGE4 bool "HP Labs BadgePAD 4" + depends on UNUSED_BOARD_FILES select ARM_SA1100_CPUFREQ select SA1111 help @@ -88,6 +91,7 @@ config SA1100_BADGE4 config SA1100_JORNADA720 bool "HP Jornada 720" + depends on UNUSED_BOARD_FILES # FIXME: select ARM_SA11x0_CPUFREQ select SA1111 help @@ -107,6 +111,7 @@ config SA1100_JORNADA720_SSP config SA1100_HACKKIT bool "HackKit Core CPU Board" + depends on UNUSED_BOARD_FILES select ARM_SA1100_CPUFREQ help Say Y here to support the HackKit Core CPU Board @@ -114,6 +119,7 @@ config SA1100_HACKKIT config SA1100_LART bool "LART" + depends on UNUSED_BOARD_FILES select ARM_SA1100_CPUFREQ help Say Y here if you are using the Linux Advanced Radio Terminal @@ -122,6 +128,7 @@ config SA1100_LART config SA1100_NANOENGINE bool "nanoEngine" + depends on UNUSED_BOARD_FILES select ARM_SA1110_CPUFREQ select FORCE_PCI select PCI_NANOENGINE @@ -132,6 +139,7 @@ config SA1100_NANOENGINE config SA1100_PLEB bool "PLEB" + depends on UNUSED_BOARD_FILES select ARM_SA1100_CPUFREQ help Say Y here if you are using version 1 of the Portable Linux @@ -141,6 +149,7 @@ config SA1100_PLEB config SA1100_SHANNON bool "Shannon" + depends on UNUSED_BOARD_FILES select ARM_SA1100_CPUFREQ select REGULATOR select REGULATOR_FIXED_VOLTAGE @@ -152,6 +161,7 @@ config SA1100_SHANNON config SA1100_SIMPAD bool "Simpad" + depends on UNUSED_BOARD_FILES select ARM_SA1110_CPUFREQ help The SIEMENS webpad SIMpad is based on the StrongARM 1110. There @@ -163,6 +173,7 @@ config SA1100_SIMPAD config SA1100_SSP tristate "Generic PIO SSP" + depends on UNUSED_BOARD_FILES help Say Y here to enable support for the generic PIO SSP driver. This isn't for audio support, but for attached sensors and -- cgit v1.2.3-58-ga151 From 4a69c8b7fed8d229db6f1b5a5de9898b4ca4d822 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 21:39:23 +0200 Subject: ARM: omap1: add Kconfig dependencies for unused boards Legacy board files with no known users are planned to get removed in early 2023, and this covers the majority of the omap1 boards as well. According to Tony, the actual users are all on OSK, Nokia770, and AMS-Delta. Additionally, the sx1 and palmte boards are supported by qemu, which is convenient for testing, so all five stay around past the initial board removal. As omap1 is now part of the multiplatform build and uses the common-clk framework, it has become easier to convert these to use devicetree based booting in the future. Cc: Janusz Krzysztofik Cc: Tony Lindgren Cc: linux-omap@vger.kernel.org Acked-by: Aaro Koskinen Signed-off-by: Arnd Bergmann --- arch/arm/configs/omap1_defconfig | 9 --------- arch/arm/mach-omap1/Kconfig | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig index 3f72d2ff7644..54a9f50122af 100644 --- a/arch/arm/configs/omap1_defconfig +++ b/arch/arm/configs/omap1_defconfig @@ -25,17 +25,8 @@ CONFIG_ARCH_OMAP850=y CONFIG_ARCH_OMAP16XX=y # CONFIG_OMAP_MUX is not set CONFIG_OMAP_RESET_CLOCKS=y -CONFIG_MACH_OMAP_INNOVATOR=y -CONFIG_MACH_OMAP_H2=y -CONFIG_MACH_OMAP_H3=y -CONFIG_MACH_HERALD=y CONFIG_MACH_OMAP_OSK=y -CONFIG_MACH_OMAP_PERSEUS2=y -CONFIG_MACH_OMAP_FSAMPLE=y -CONFIG_MACH_VOICEBLUE=y CONFIG_MACH_OMAP_PALMTE=y -CONFIG_MACH_OMAP_PALMZ71=y -CONFIG_MACH_OMAP_PALMTT=y CONFIG_MACH_SX1=y CONFIG_MACH_NOKIA770=y CONFIG_MACH_AMS_DELTA=y diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index cbeb2b3ba86e..538a960257cc 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig @@ -132,6 +132,7 @@ comment "OMAP Board Type" config MACH_OMAP_INNOVATOR bool "TI Innovator" depends on ARCH_OMAP15XX || ARCH_OMAP16XX + depends on UNUSED_BOARD_FILES help TI OMAP 1510 or 1610 Innovator board support. Say Y here if you have such a board. @@ -139,6 +140,7 @@ config MACH_OMAP_INNOVATOR config MACH_OMAP_H2 bool "TI H2 Support" depends on ARCH_OMAP16XX + depends on UNUSED_BOARD_FILES help TI OMAP 1610/1611B H2 board support. Say Y here if you have such a board. @@ -146,6 +148,7 @@ config MACH_OMAP_H2 config MACH_OMAP_H3 bool "TI H3 Support" depends on ARCH_OMAP16XX + depends on UNUSED_BOARD_FILES help TI OMAP 1710 H3 board support. Say Y here if you have such a board. @@ -153,6 +156,7 @@ config MACH_OMAP_H3 config MACH_HERALD bool "HTC Herald" depends on ARCH_OMAP850 + depends on UNUSED_BOARD_FILES help HTC Herald smartphone support (AKA T-Mobile Wing, ...) @@ -166,6 +170,7 @@ config MACH_OMAP_OSK config OMAP_OSK_MISTRAL bool "Mistral QVGA board Support" depends on MACH_OMAP_OSK + depends on UNUSED_BOARD_FILES help The OSK supports an optional add-on board with a Quarter-VGA touchscreen, PDA-ish buttons, a resume button, bicolor LED, @@ -174,6 +179,7 @@ config OMAP_OSK_MISTRAL config MACH_OMAP_PERSEUS2 bool "TI Perseus2" depends on ARCH_OMAP730 + depends on UNUSED_BOARD_FILES help Support for TI OMAP 730 Perseus2 board. Say Y here if you have such a board. @@ -181,6 +187,7 @@ config MACH_OMAP_PERSEUS2 config MACH_OMAP_FSAMPLE bool "TI F-Sample" depends on ARCH_OMAP730 + depends on UNUSED_BOARD_FILES help Support for TI OMAP 850 F-Sample board. Say Y here if you have such a board. @@ -197,6 +204,7 @@ config MACH_OMAP_PALMTE config MACH_OMAP_PALMZ71 bool "Palm Zire71" depends on ARCH_OMAP15XX + depends on UNUSED_BOARD_FILES help Support for the Palm Zire71 PDA. To boot the kernel, you'll need a PalmOS compatible bootloader; check out @@ -206,6 +214,7 @@ config MACH_OMAP_PALMZ71 config MACH_OMAP_PALMTT bool "Palm Tungsten|T" depends on ARCH_OMAP15XX + depends on UNUSED_BOARD_FILES help Support for the Palm Tungsten|T PDA. To boot the kernel, you'll need a PalmOS compatible bootloader (Garux); check out @@ -246,6 +255,7 @@ config MACH_AMS_DELTA config MACH_OMAP_GENERIC bool "Generic OMAP board" depends on ARCH_OMAP15XX || ARCH_OMAP16XX + depends on UNUSED_BOARD_FILES help Support for generic OMAP-1510, 1610 or 1710 board with no FPGA. Can be used as template for porting Linux to -- cgit v1.2.3-58-ga151 From d75595e0962acf5e06cf6a04638bc8d31ed4b3b1 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 22:13:16 +0200 Subject: ARM: s3c: mark most board files as unused The s3c24xx platform is already scheduled for removal in early 2023, with s3c64xx meeting the same fate a year later. Most of the s3c64xx board files appear to be unused, as the better maintained ones already got converted to DT. The main exception is the Wolfson Cragganmore board, which remains in use as the reference design for Wolfson/Cirrus devices. As the other boards get removed, this one stays around along with the DT based machines. The s3c6400_defconfig file now disables the unused boards, while the s3c24xx defconfig files all turn on CONFIG_UNUSED_BOARD_FILES to remain usable. Cc: Krzysztof Kozlowski Cc: Alim Akhtar Cc: linux-samsung-soc@vger.kernel.org Signed-off-by: Arnd Bergmann --- arch/arm/configs/mini2440_defconfig | 1 + arch/arm/configs/s3c2410_defconfig | 1 + arch/arm/configs/s3c6400_defconfig | 9 --------- arch/arm/configs/tct_hammer_defconfig | 1 + arch/arm/mach-s3c/Kconfig.s3c24xx | 2 +- arch/arm/mach-s3c/Kconfig.s3c64xx | 20 ++++++++++---------- 6 files changed, 14 insertions(+), 20 deletions(-) diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig index 5b4ab5bf5c5f..86e00f684e16 100644 --- a/arch/arm/configs/mini2440_defconfig +++ b/arch/arm/configs/mini2440_defconfig @@ -11,6 +11,7 @@ CONFIG_S3C_ADC=y CONFIG_CPU_S3C2440=y CONFIG_MACH_MINI2440=y CONFIG_AEABI=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_KEXEC=y CONFIG_CPU_IDLE=y CONFIG_APM_EMULATION=y diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index 2789e96e4ef6..41b40863a78e 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig @@ -37,6 +37,7 @@ CONFIG_ARCH_S3C2440=y CONFIG_MACH_NEO1973_GTA02=y CONFIG_MACH_RX1950=y CONFIG_MACH_SMDK2443=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="root=/dev/hda1 ro init=/bin/bash console=ttySAC0" CONFIG_FPE_NWFPE=y CONFIG_FPE_NWFPE_XP=y diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_defconfig index 300f5a7febf0..4f04f583c738 100644 --- a/arch/arm/configs/s3c6400_defconfig +++ b/arch/arm/configs/s3c6400_defconfig @@ -5,15 +5,6 @@ CONFIG_KALLSYMS_ALL=y CONFIG_ARCH_MULTI_V6=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_S3C64XX=y -CONFIG_MACH_SMDK6400=y -CONFIG_MACH_ANW6410=y -CONFIG_MACH_MINI6410=y -CONFIG_MACH_REAL6410=y -CONFIG_MACH_SMDK6410=y -CONFIG_MACH_NCP=y -CONFIG_MACH_HMT=y -CONFIG_MACH_SMARTQ5=y -CONFIG_MACH_SMARTQ7=y CONFIG_MACH_WLF_CRAGG_6410=y CONFIG_CMDLINE="console=ttySAC0,115200 root=/dev/ram init=/linuxrc initrd=0x51000000,6M ramdisk_size=6144" CONFIG_VFP=y diff --git a/arch/arm/configs/tct_hammer_defconfig b/arch/arm/configs/tct_hammer_defconfig index ce95cc97dcac..3b29ae1fb750 100644 --- a/arch/arm/configs/tct_hammer_defconfig +++ b/arch/arm/configs/tct_hammer_defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH_MULTI_V4T=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_S3C24XX=y CONFIG_MACH_TCT_HAMMER=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="mem=64M root=/dev/ram0 init=/linuxrc rw" CONFIG_FPE_NWFPE=y CONFIG_MODULES=y diff --git a/arch/arm/mach-s3c/Kconfig.s3c24xx b/arch/arm/mach-s3c/Kconfig.s3c24xx index 88a5a333312a..c28e75424947 100644 --- a/arch/arm/mach-s3c/Kconfig.s3c24xx +++ b/arch/arm/mach-s3c/Kconfig.s3c24xx @@ -8,7 +8,7 @@ menuconfig ARCH_S3C24XX bool "Samsung S3C24XX SoCs (deprecated, see help)" depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 depends on CPU_LITTLE_ENDIAN - depends on ATAGS + depends on ATAGS && UNUSED_BOARD_FILES select CLKSRC_SAMSUNG_PWM select GPIO_SAMSUNG select GPIOLIB diff --git a/arch/arm/mach-s3c/Kconfig.s3c64xx b/arch/arm/mach-s3c/Kconfig.s3c64xx index 2b27bff4d928..46f4fd795de5 100644 --- a/arch/arm/mach-s3c/Kconfig.s3c64xx +++ b/arch/arm/mach-s3c/Kconfig.s3c64xx @@ -114,8 +114,8 @@ config S3C64XX_SETUP_USB_PHY # S36400 Macchine support config MACH_SMDK6400 - bool "SMDK6400" - depends on ATAGS + bool "SMDK6400" + depends on ATAGS && UNUSED_BOARD_FILES select CPU_S3C6400 select S3C64XX_SETUP_SDHCI select S3C_DEV_HSMMC1 @@ -126,7 +126,7 @@ config MACH_SMDK6400 config MACH_ANW6410 bool "A&W6410" - depends on ATAGS + depends on ATAGS && UNUSED_BOARD_FILES select CPU_S3C6410 select S3C64XX_SETUP_FB_24BPP select S3C_DEV_FB @@ -135,7 +135,7 @@ config MACH_ANW6410 config MACH_MINI6410 bool "MINI6410" - depends on ATAGS + depends on ATAGS && UNUSED_BOARD_FILES select CPU_S3C6410 select S3C64XX_SETUP_FB_24BPP select S3C64XX_SETUP_SDHCI @@ -151,7 +151,7 @@ config MACH_MINI6410 config MACH_REAL6410 bool "REAL6410" - depends on ATAGS + depends on ATAGS && UNUSED_BOARD_FILES select CPU_S3C6410 select S3C64XX_SETUP_FB_24BPP select S3C64XX_SETUP_SDHCI @@ -167,7 +167,7 @@ config MACH_REAL6410 config MACH_SMDK6410 bool "SMDK6410" - depends on ATAGS + depends on ATAGS && UNUSED_BOARD_FILES select CPU_S3C6410 select S3C64XX_SETUP_FB_24BPP select S3C64XX_SETUP_I2C1 @@ -254,7 +254,7 @@ config SMDK6410_WM1192_EV1 config MACH_NCP bool "NCP" - depends on ATAGS + depends on ATAGS && UNUSED_BOARD_FILES select CPU_S3C6410 select S3C64XX_SETUP_I2C1 select S3C_DEV_HSMMC1 @@ -264,7 +264,7 @@ config MACH_NCP config MACH_HMT bool "Airgoo HMT" - depends on ATAGS + depends on ATAGS && UNUSED_BOARD_FILES select CPU_S3C6410 select S3C64XX_SETUP_FB_24BPP select S3C_DEV_FB @@ -296,14 +296,14 @@ config MACH_SMARTQ config MACH_SMARTQ5 bool "SmartQ 5" - depends on ATAGS + depends on ATAGS && UNUSED_BOARD_FILES select MACH_SMARTQ help Machine support for the SmartQ 5 config MACH_SMARTQ7 bool "SmartQ 7" - depends on ATAGS + depends on ATAGS && UNUSED_BOARD_FILES select MACH_SMARTQ help Machine support for the SmartQ 7 -- cgit v1.2.3-58-ga151 From 6460e993be65d23fbdbf0a79039f4535ae6b1109 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 19 Jul 2022 14:59:06 +0200 Subject: ARM: iop32x: mark as unused The iop32x platform has recently been converted to be part of the multiplatform configuration, and it should be possible to keep it alive for longer by making it boot from devicetree like we did for the related ixp4xx platform. However, it appears that no users remain at this point, so just mark the entire platform depending on CONFIG_UNUSED_BOARD_FILES, with the intention of removing it in early 2023. If any users remain, please speak up now. Cc: Lennert Buytenhek Acked-by: Dan Williams Signed-off-by: Arnd Bergmann --- arch/arm/configs/iop32x_defconfig | 1 + arch/arm/mach-iop32x/Kconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/iop32x_defconfig b/arch/arm/configs/iop32x_defconfig index 3bc51fb4ebc9..c16e92cdfd00 100644 --- a/arch/arm/configs/iop32x_defconfig +++ b/arch/arm/configs/iop32x_defconfig @@ -9,6 +9,7 @@ CONFIG_MACH_GLANTANK=y CONFIG_ARCH_IQ80321=y CONFIG_ARCH_IQ31244=y CONFIG_MACH_N2100=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp cachepolicy=writealloc" CONFIG_FPE_NWFPE=y CONFIG_BINFMT_AOUT=y diff --git a/arch/arm/mach-iop32x/Kconfig b/arch/arm/mach-iop32x/Kconfig index 142c6374543c..761fbb04faa1 100644 --- a/arch/arm/mach-iop32x/Kconfig +++ b/arch/arm/mach-iop32x/Kconfig @@ -3,7 +3,7 @@ menuconfig ARCH_IOP32X bool "IOP32x-based platforms" depends on ARCH_MULTI_V5 depends on CPU_LITTLE_ENDIAN - depends on ATAGS + depends on ATAGS && UNUSED_BOARD_FILES select CPU_XSCALE select GPIO_IOP select GPIOLIB -- cgit v1.2.3-58-ga151 From 1785ab769824b800d7dea83aecc88c90377a6a5d Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 22:58:47 +0200 Subject: ARM: cns3xxx: add CONFIG_UNUSED_BOARD_FILES dependency Krzysztof Halasa has kept the cns3xxx platform working for a long time but has moved away from working on it. The OpenWRT port was dropped in 2020, and support for the Gateworks Laguna platform never made it into the mainline kernel, which only supports the reference design. Further, the ARM11MPCore has an unresolved issue with instruction cache coherency, and removing support for the remaining platforms using this core would be the easiest solution. Mark the entire platform as unused now, to be removed in early 2023 if no users show up. Cc: Krzysztof Halasa Link: https://lore.kernel.org/lkml/20210616152326.GG22278@shell.armlinux.org.uk/ Signed-off-by: Arnd Bergmann --- arch/arm/configs/cns3420vb_defconfig | 1 + arch/arm/mach-cns3xxx/Kconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/cns3420vb_defconfig b/arch/arm/configs/cns3420vb_defconfig index 53f601bbe647..b3aab97c0728 100644 --- a/arch/arm/configs/cns3420vb_defconfig +++ b/arch/arm/configs/cns3420vb_defconfig @@ -12,6 +12,7 @@ CONFIG_PROFILING=y CONFIG_ARCH_MULTI_V6=y CONFIG_ARCH_CNS3XXX=y CONFIG_MACH_CNS3420VB=y +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="console=ttyS0,38400 mem=128M root=/dev/mmcblk0p1 ro rootwait" CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig index 622f3cf28c68..1f85deff2486 100644 --- a/arch/arm/mach-cns3xxx/Kconfig +++ b/arch/arm/mach-cns3xxx/Kconfig @@ -2,7 +2,7 @@ menuconfig ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" depends on ARCH_MULTI_V6 - depends on ATAGS + depends on ATAGS && UNUSED_BOARD_FILES select ARM_GIC help Support for Cavium Networks CNS3XXX platform. -- cgit v1.2.3-58-ga151