From 336291304692faf1449c4fe9087bec73bcf188ec Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 21:26:45 +0200 Subject: [PATCH] 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 17978807..506f337 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 d4f3f9a..7e6f7df 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 19bc294..b9327b2 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 d9e2551..3dcf89d 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 3dad6ad..0c2f19d 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 e109d87..d872633 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 feaec54..42252e8 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 7956f0d..cc45172 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 66e79fa..7e0161c 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 -- 2.7.4