diff mbox series

[2/2] serial: Remove obsolete CONS_INDEX_n Kconfig options

Message ID 20220509051055.40232-2-samuel@sholland.org
State Accepted
Commit 7495051219b64ec0e8fac8930586dc10666530da
Delegated to: Andre Przywara
Headers show
Series [1/2] sunxi: Remove obsolete Kconfig selections | expand

Commit Message

Samuel Holland May 9, 2022, 5:10 a.m. UTC
These were only ever implied by sunxi platforms, and that usage has
been removed. Current practice is to specify CONFIG_CONS_INDEX in each
board's defconfig.

Signed-off-by: Samuel Holland <samuel@sholland.org>
---

 drivers/serial/Kconfig | 26 --------------------------
 1 file changed, 26 deletions(-)

Comments

Tom Rini May 9, 2022, 1:19 p.m. UTC | #1
On Mon, May 09, 2022 at 12:10:55AM -0500, Samuel Holland wrote:

> These were only ever implied by sunxi platforms, and that usage has
> been removed. Current practice is to specify CONFIG_CONS_INDEX in each
> board's defconfig.
> 
> Signed-off-by: Samuel Holland <samuel@sholland.org>

Reviewed-by: Tom Rini <trini@konsulko.com>
Andre Przywara May 9, 2022, 11:45 p.m. UTC | #2
On Mon,  9 May 2022 00:10:55 -0500
Samuel Holland <samuel@sholland.org> wrote:

> These were only ever implied by sunxi platforms, and that usage has
> been removed. Current practice is to specify CONFIG_CONS_INDEX in each
> board's defconfig.

Indeed. Verified by creating the .config files for all 160 ARCH_SUNXI
_defconfigs, with and without this series: they were identical.

> Signed-off-by: Samuel Holland <samuel@sholland.org>

Acked-by: Andre Przywara <andre.przywara@arm.com>

Thanks!
Andre

> ---
> 
>  drivers/serial/Kconfig | 26 --------------------------
>  1 file changed, 26 deletions(-)
> 
> diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
> index 1e595d0600..71a0591697 100644
> --- a/drivers/serial/Kconfig
> +++ b/drivers/serial/Kconfig
> @@ -74,36 +74,10 @@ config TPL_SERIAL_PRESENT
>  	  This option enables the full UART in TPL, so if is it disabled,
>  	  the full UART driver will be omitted, thus saving space.
>  
> -# Logic to allow us to use the imply keyword to set what the default port
> -# should be.  The default is otherwise 1.
> -config CONS_INDEX_0
> -	bool
> -
> -config CONS_INDEX_2
> -	bool
> -
> -config CONS_INDEX_3
> -	bool
> -
> -config CONS_INDEX_4
> -	bool
> -
> -config CONS_INDEX_5
> -	bool
> -
> -config CONS_INDEX_6
> -	bool
> -
>  config CONS_INDEX
>  	int "UART used for console"
>  	depends on SPECIFY_CONSOLE_INDEX
>  	range 0 6
> -	default 0 if CONS_INDEX_0
> -	default 2 if CONS_INDEX_2
> -	default 3 if CONS_INDEX_3
> -	default 4 if CONS_INDEX_4
> -	default 5 if CONS_INDEX_5
> -	default 6 if CONS_INDEX_6
>  	default 1
>  	help
>  	  Set this to match the UART number of the serial console.
Andre Przywara May 24, 2022, 3:57 p.m. UTC | #3
On Mon,  9 May 2022 00:10:55 -0500
Samuel Holland <samuel@sholland.org> wrote:

> These were only ever implied by sunxi platforms, and that usage has
> been removed. Current practice is to specify CONFIG_CONS_INDEX in each
> board's defconfig.
> 
> Signed-off-by: Samuel Holland <samuel@sholland.org>

Applied to sunxi/master.

Thanks!
Andre

> ---
> 
>  drivers/serial/Kconfig | 26 --------------------------
>  1 file changed, 26 deletions(-)
> 
> diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
> index 1e595d0600..71a0591697 100644
> --- a/drivers/serial/Kconfig
> +++ b/drivers/serial/Kconfig
> @@ -74,36 +74,10 @@ config TPL_SERIAL_PRESENT
>  	  This option enables the full UART in TPL, so if is it disabled,
>  	  the full UART driver will be omitted, thus saving space.
>  
> -# Logic to allow us to use the imply keyword to set what the default port
> -# should be.  The default is otherwise 1.
> -config CONS_INDEX_0
> -	bool
> -
> -config CONS_INDEX_2
> -	bool
> -
> -config CONS_INDEX_3
> -	bool
> -
> -config CONS_INDEX_4
> -	bool
> -
> -config CONS_INDEX_5
> -	bool
> -
> -config CONS_INDEX_6
> -	bool
> -
>  config CONS_INDEX
>  	int "UART used for console"
>  	depends on SPECIFY_CONSOLE_INDEX
>  	range 0 6
> -	default 0 if CONS_INDEX_0
> -	default 2 if CONS_INDEX_2
> -	default 3 if CONS_INDEX_3
> -	default 4 if CONS_INDEX_4
> -	default 5 if CONS_INDEX_5
> -	default 6 if CONS_INDEX_6
>  	default 1
>  	help
>  	  Set this to match the UART number of the serial console.
diff mbox series

Patch

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 1e595d0600..71a0591697 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -74,36 +74,10 @@  config TPL_SERIAL_PRESENT
 	  This option enables the full UART in TPL, so if is it disabled,
 	  the full UART driver will be omitted, thus saving space.
 
-# Logic to allow us to use the imply keyword to set what the default port
-# should be.  The default is otherwise 1.
-config CONS_INDEX_0
-	bool
-
-config CONS_INDEX_2
-	bool
-
-config CONS_INDEX_3
-	bool
-
-config CONS_INDEX_4
-	bool
-
-config CONS_INDEX_5
-	bool
-
-config CONS_INDEX_6
-	bool
-
 config CONS_INDEX
 	int "UART used for console"
 	depends on SPECIFY_CONSOLE_INDEX
 	range 0 6
-	default 0 if CONS_INDEX_0
-	default 2 if CONS_INDEX_2
-	default 3 if CONS_INDEX_3
-	default 4 if CONS_INDEX_4
-	default 5 if CONS_INDEX_5
-	default 6 if CONS_INDEX_6
 	default 1
 	help
 	  Set this to match the UART number of the serial console.