From d75595e0962acf5e06cf6a04638bc8d31ed4b3b1 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 18 Jul 2022 22:13:16 +0200 Subject: [PATCH] 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