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/mach-s3c/Kconfig.s3c24xx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-s3c') 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 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/mach-s3c/Kconfig.s3c24xx | 2 +- arch/arm/mach-s3c/Kconfig.s3c64xx | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'arch/arm/mach-s3c') 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