2020-03-05 23:46:39

by Randy Dunlap

Subject: [PATCH 2/2] tty: source all tty/*/Kconfig files from tty/Kconfig

From: Randy Dunlap <[email protected]>

'source' (include) all of the tty/*/Kconfig files from
drivers/tty/Kconfig instead of from drivers/char/Kconfig.
This consolidates them both in source code and in menu
presentation to the user.

Suggested-by: Arnd Bergmann <[email protected]>
Signed-off-by: Randy Dunlap <[email protected]>
---
Follows [PATCH] char: group some /dev configs together and un-split tty configs
as [PATCH 2/2], where [PATCH (1/2)] is here:
https://lore.kernel.org/lkml/[email protected]/


drivers/char/Kconfig | 5 -----
drivers/tty/Kconfig | 6 ++++++
2 files changed, 6 insertions(+), 5 deletions(-)

--- linux-next-20200304.orig/drivers/char/Kconfig
+++ linux-next-20200304/drivers/char/Kconfig
@@ -7,9 +7,6 @@ menu "Character devices"

source "drivers/tty/Kconfig"

-source "drivers/tty/serial/Kconfig"
-source "drivers/tty/serdev/Kconfig"
-
config TTY_PRINTK
tristate "TTY driver to output user messages via printk"
depends on EXPERT && TTY
@@ -94,8 +91,6 @@ config PPDEV

If unsure, say N.

-source "drivers/tty/hvc/Kconfig"
-
config VIRTIO_CONSOLE
tristate "Virtio console"
depends on VIRTIO && TTY
--- linux-next-20200304.orig/drivers/tty/Kconfig
+++ linux-next-20200304/drivers/tty/Kconfig
@@ -478,3 +478,9 @@ config LDISC_AUTOLOAD
only set the default value of this functionality.

endif # TTY
+
+source "drivers/tty/serial/Kconfig"
+
+source "drivers/tty/serdev/Kconfig"
+
+source "drivers/tty/hvc/Kconfig"

2020-03-06 07:20:59

by Jiri Slaby

Subject: Re: [PATCH 2/2] tty: source all tty/*/Kconfig files from tty/Kconfig

On 06. 03. 20, 0:45, Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> 'source' (include) all of the tty/*/Kconfig files from
> drivers/tty/Kconfig instead of from drivers/char/Kconfig.
> This consolidates them both in source code and in menu
> presentation to the user.
>
> Suggested-by: Arnd Bergmann <[email protected]>
> Signed-off-by: Randy Dunlap <[email protected]>
> ---
> Follows [PATCH] char: group some /dev configs together and un-split tty configs
> as [PATCH 2/2], where [PATCH (1/2)] is here:
> https://lore.kernel.org/lkml/[email protected]/
>
>
> drivers/char/Kconfig | 5 -----
> drivers/tty/Kconfig | 6 ++++++
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> --- linux-next-20200304.orig/drivers/char/Kconfig
> +++ linux-next-20200304/drivers/char/Kconfig
> @@ -7,9 +7,6 @@ menu "Character devices"
>
> source "drivers/tty/Kconfig"
>
> -source "drivers/tty/serial/Kconfig"
> -source "drivers/tty/serdev/Kconfig"
> -
> config TTY_PRINTK
> tristate "TTY driver to output user messages via printk"
> depends on EXPERT && TTY
> @@ -94,8 +91,6 @@ config PPDEV
>
> If unsure, say N.
>
> -source "drivers/tty/hvc/Kconfig"
> -
> config VIRTIO_CONSOLE
> tristate "Virtio console"
> depends on VIRTIO && TTY
> --- linux-next-20200304.orig/drivers/tty/Kconfig
> +++ linux-next-20200304/drivers/tty/Kconfig
> @@ -478,3 +478,9 @@ config LDISC_AUTOLOAD
> only set the default value of this functionality.
>
> endif # TTY
> +
> +source "drivers/tty/serial/Kconfig"
> +
> +source "drivers/tty/serdev/Kconfig"
> +
> +source "drivers/tty/hvc/Kconfig"

Maybe sort them alphabetically? That way, you could move the hvc/Kconfig
and serial/Kconfig inside the if-endif above and remove the whole-file
if-TTYs in the 2.

thanks,
--
js
suse labs

2020-03-06 19:09:40

by Randy Dunlap

Subject: Re: [PATCH 2/2] tty: source all tty/*/Kconfig files from tty/Kconfig

On 3/5/20 11:19 PM, Jiri Slaby wrote:
> On 06. 03. 20, 0:45, Randy Dunlap wrote:
>> From: Randy Dunlap <[email protected]>
>>
>> 'source' (include) all of the tty/*/Kconfig files from
>> drivers/tty/Kconfig instead of from drivers/char/Kconfig.
>> This consolidates them both in source code and in menu
>> presentation to the user.
>>
>> Suggested-by: Arnd Bergmann <[email protected]>
>> Signed-off-by: Randy Dunlap <[email protected]>
>> ---
>> Follows [PATCH] char: group some /dev configs together and un-split tty configs
>> as [PATCH 2/2], where [PATCH (1/2)] is here:
>> https://lore.kernel.org/lkml/[email protected]/
>>
>>
>> drivers/char/Kconfig | 5 -----
>> drivers/tty/Kconfig | 6 ++++++
>> 2 files changed, 6 insertions(+), 5 deletions(-)
>>
>> --- linux-next-20200304.orig/drivers/char/Kconfig
>> +++ linux-next-20200304/drivers/char/Kconfig
>> @@ -7,9 +7,6 @@ menu "Character devices"
>>
>> source "drivers/tty/Kconfig"
>>
>> -source "drivers/tty/serial/Kconfig"
>> -source "drivers/tty/serdev/Kconfig"
>> -
>> config TTY_PRINTK
>> tristate "TTY driver to output user messages via printk"
>> depends on EXPERT && TTY
>> @@ -94,8 +91,6 @@ config PPDEV
>>
>> If unsure, say N.
>>
>> -source "drivers/tty/hvc/Kconfig"
>> -
>> config VIRTIO_CONSOLE
>> tristate "Virtio console"
>> depends on VIRTIO && TTY
>> --- linux-next-20200304.orig/drivers/tty/Kconfig
>> +++ linux-next-20200304/drivers/tty/Kconfig
>> @@ -478,3 +478,9 @@ config LDISC_AUTOLOAD
>> only set the default value of this functionality.
>>
>> endif # TTY
>> +
>> +source "drivers/tty/serial/Kconfig"
>> +
>> +source "drivers/tty/serdev/Kconfig"
>> +
>> +source "drivers/tty/hvc/Kconfig"
>
> Maybe sort them alphabetically? That way, you could move the hvc/Kconfig
> and serial/Kconfig inside the if-endif above and remove the whole-file
> if-TTYs in the 2.

Hi Jiri,

OK, I'll send a v2 with those changes.

thanks.
--
~Randy