sunxi: Remove obsolete Kconfig selections
Subsystems (3)
Samuel Holland
maintainerPATCH 1/2 sunxi: Remove obsolete Kconfig selections
ARCH_SUNXI selects DM_SERIAL, so the condition can never be satisfied.
---
arch/arm/mach-sunxi/Kconfig | 3 --- 1 file changed, 3 deletions(-)
arch/arm/mach-sunxi/Kconfig +0 -3
@@ -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)"
Signature · 1 line
2.35.1
Samuel Holland
maintainerPATCH 2/2 serial: Remove obsolete CONS_INDEX_n Kconfig options
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.
---
drivers/serial/Kconfig | 26 -------------------------- 1 file changed, 26 deletions(-)
drivers/serial/Kconfig +0 -26
@@ -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.
Signature · 1 line
2.35.1
Re: [PATCH 2/2] serial: Remove obsolete CONS_INDEX_n Kconfig options
Quoted 5 lines · Samuel Holland
These were only ever implied by sunxi platforms, and that usage has been removed. Current practice is to specify
CONFIG_CONS_INDEXin each board's defconfig.Signed-off-by Samuel Holland <[email protected]>
Signature · 1 line
Tom
Re: [PATCH 2/2] serial: Remove obsolete CONS_INDEX_n Kconfig options
In reply to Samuel HollandQuoted 3 lines · On Mon, 9 May 2022 00:10:55 -0500 Samuel Holland <[email protected]> wrote:
These were only ever implied by sunxi platforms, and that usage has been removed. Current practice is to specify
CONFIG_CONS_INDEXin 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.
Quoted 1 line
Signed-off-by Samuel Holland <[email protected]>
Thanks!
Andre
Quoted 46 lines
---
drivers/serial/Kconfig | 26 -------------------------- 1 file changed, 26 deletions(-)drivers/serial/Kconfig +0
-26@@ -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
AppliedRe: [PATCH 2/2] serial: Remove obsolete CONS_INDEX_n Kconfig options
In reply to Samuel HollandQuoted 5 lines · On Mon, 9 May 2022 00:10:55 -0500 Samuel Holland <[email protected]> wrote:
These were only ever implied by sunxi platforms, and that usage has been removed. Current practice is to specify
CONFIG_CONS_INDEXin each board's defconfig.Signed-off-by Samuel Holland <[email protected]>
Applied to sunxi/master.
Thanks!
Andre
Quoted 46 lines
---
drivers/serial/Kconfig | 26 -------------------------- 1 file changed, 26 deletions(-)drivers/serial/Kconfig +0
-26@@ -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.
Quoted 1 line · On Mon, 9 May 2022 00:10:54 -0500 Samuel Holland <[email protected]> wrote:
ARCH_SUNXIselectsDM_SERIAL, so the condition can never be satisfied.
True, and even if !DM_SERIAL would be a thing, it looks odd to begin with.
Quoted 1 line
Signed-off-by Samuel Holland <[email protected]>
Cheers,
Andre
Quoted 33 lines
---
arch/arm/mach-sunxi/Kconfig | 3 --- 1 file changed, 3 deletions(-)arch/arm/mach-sunxi/Kconfig +0
-3@@ -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)"
Andre Przywara
AppliedQuoted 3 lines · On Mon, 9 May 2022 00:10:54 -0500 Samuel Holland <[email protected]> wrote:
ARCH_SUNXIselectsDM_SERIAL, so the condition can never be satisfied.Signed-off-by Samuel Holland <[email protected]>
Applied to sunxi/master.
Thanks!
Andre
Quoted 33 lines
---
arch/arm/mach-sunxi/Kconfig | 3 --- 1 file changed, 3 deletions(-)arch/arm/mach-sunxi/Kconfig +0
-3@@ -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)"