[PATCH 1/2] sunxi: Remove obsolete Kconfig selections

[PATCH 1/2] sunxi: Remove obsolete Kconfig selections

[Samuel Holland]

ARCH_SUNXI selects DM_SERIAL, so the condition can never be satisfied.

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

 arch/arm/mach-sunxi/Kconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 1f43b25324..ee606c5bbc 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -207,7 +207,6 @@ config MACH_SUN5I
 	select PHY_SUN4I_USB
 	select SUNXI_GEN_SUN4I
 	select SUPPORT_SPL
-	imply CONS_INDEX_2 if !DM_SERIAL
 	imply SPL_SYS_I2C_LEGACY
 	imply SYS_I2C_LEGACY
 
@@ -255,7 +254,6 @@ config MACH_SUN8I_A23
 	select SUPPORT_SPL
 	select SYS_I2C_SUN8I_RSB
 	select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
-	imply CONS_INDEX_5 if !DM_SERIAL
 
 config MACH_SUN8I_A33
 	bool "sun8i (Allwinner A33)"
@@ -270,7 +268,6 @@ config MACH_SUN8I_A33
 	select SUPPORT_SPL
 	select SYS_I2C_SUN8I_RSB
 	select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
-	imply CONS_INDEX_5 if !DM_SERIAL
 
 config MACH_SUN8I_A83T
 	bool "sun8i (Allwinner A83T)"
-- 
2.35.1

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

[Samuel Holland]

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(-)

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.
-- 
2.35.1

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

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 351 bytes --]

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>

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH 1/2] sunxi: Remove obsolete Kconfig selections

[Andre Przywara]

On Mon,  9 May 2022 00:10:54 -0500
Samuel Holland <samuel@sholland.org> wrote:

> ARCH_SUNXI selects DM_SERIAL, so the condition can never be satisfied.

True, and even if !DM_SERIAL would be a thing, it looks odd to begin
with.

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

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

Cheers,
Andre

> ---
> 
>  arch/arm/mach-sunxi/Kconfig | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> index 1f43b25324..ee606c5bbc 100644
> --- a/arch/arm/mach-sunxi/Kconfig
> +++ b/arch/arm/mach-sunxi/Kconfig
> @@ -207,7 +207,6 @@ config MACH_SUN5I
>  	select PHY_SUN4I_USB
>  	select SUNXI_GEN_SUN4I
>  	select SUPPORT_SPL
> -	imply CONS_INDEX_2 if !DM_SERIAL
>  	imply SPL_SYS_I2C_LEGACY
>  	imply SYS_I2C_LEGACY
>  
> @@ -255,7 +254,6 @@ config MACH_SUN8I_A23
>  	select SUPPORT_SPL
>  	select SYS_I2C_SUN8I_RSB
>  	select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
> -	imply CONS_INDEX_5 if !DM_SERIAL
>  
>  config MACH_SUN8I_A33
>  	bool "sun8i (Allwinner A33)"
> @@ -270,7 +268,6 @@ config MACH_SUN8I_A33
>  	select SUPPORT_SPL
>  	select SYS_I2C_SUN8I_RSB
>  	select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
> -	imply CONS_INDEX_5 if !DM_SERIAL
>  
>  config MACH_SUN8I_A83T
>  	bool "sun8i (Allwinner A83T)"

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

[Andre Przywara]

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.

Re: [PATCH 1/2] sunxi: Remove obsolete Kconfig selections

[Andre Przywara]

On Mon,  9 May 2022 00:10:54 -0500
Samuel Holland <samuel@sholland.org> wrote:

> ARCH_SUNXI selects DM_SERIAL, so the condition can never be satisfied.
> 
> Signed-off-by: Samuel Holland <samuel@sholland.org>

Applied to sunxi/master.

Thanks!
Andre

> ---
> 
>  arch/arm/mach-sunxi/Kconfig | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> index 1f43b25324..ee606c5bbc 100644
> --- a/arch/arm/mach-sunxi/Kconfig
> +++ b/arch/arm/mach-sunxi/Kconfig
> @@ -207,7 +207,6 @@ config MACH_SUN5I
>  	select PHY_SUN4I_USB
>  	select SUNXI_GEN_SUN4I
>  	select SUPPORT_SPL
> -	imply CONS_INDEX_2 if !DM_SERIAL
>  	imply SPL_SYS_I2C_LEGACY
>  	imply SYS_I2C_LEGACY
>  
> @@ -255,7 +254,6 @@ config MACH_SUN8I_A23
>  	select SUPPORT_SPL
>  	select SYS_I2C_SUN8I_RSB
>  	select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
> -	imply CONS_INDEX_5 if !DM_SERIAL
>  
>  config MACH_SUN8I_A33
>  	bool "sun8i (Allwinner A33)"
> @@ -270,7 +268,6 @@ config MACH_SUN8I_A33
>  	select SUPPORT_SPL
>  	select SYS_I2C_SUN8I_RSB
>  	select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
> -	imply CONS_INDEX_5 if !DM_SERIAL
>  
>  config MACH_SUN8I_A83T
>  	bool "sun8i (Allwinner A83T)"

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

[Andre Przywara]

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.