diff mbox series

[10/13] ARM: omap1: add Kconfig dependencies for unused boards

Message ID 20220721141722.2414719-11-arnd@kernel.org
State New
Headers show
Series ARM: mark most boards as unused | expand

Commit Message

Arnd Bergmann July 21, 2022, 2:17 p.m. UTC
From: Arnd Bergmann <arnd@arndb.de>

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: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/configs/omap1_defconfig |  9 ---------
 arch/arm/mach-omap1/Kconfig      | 10 ++++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)

Comments

Aaro Koskinen July 21, 2022, 3:03 p.m. UTC | #1
Hi,

On Thu, Jul 21, 2022 at 04:17:19PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> 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.

Actually also Palm TE gets tested with real hardware, I haven't got the
kernel working on QEMU.

> 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: Aaro Koskinen <aaro.koskinen@iki.fi>

Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>

> Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: linux-omap@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  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
> -- 
> 2.29.2
> 

A.
diff mbox series

Patch

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