Skip to content

Commit d3ea050

Browse files
arndbgregkh
authored andcommitted
dummycon: fix default rows/cols
[ Upstream commit beefaba ] dummycon fails to build on ARM/footbridge when the VGA console is disabled, since I got the dependencies slightly wrong in a previous patch: drivers/video/console/dummycon.c: In function 'dummycon_init': drivers/video/console/dummycon.c:27:25: error: 'CONFIG_DUMMY_CONSOLE_COLUMNS' undeclared (first use in this function); did you mean 'CONFIG_DUMMY_CONSOLE'? 27 | #define DUMMY_COLUMNS CONFIG_DUMMY_CONSOLE_COLUMNS drivers/video/console/dummycon.c:28:25: error: 'CONFIG_DUMMY_CONSOLE_ROWS' undeclared (first use in this function); did you mean 'CONFIG_DUMMY_CONSOLE'? 28 | #define DUMMY_ROWS CONFIG_DUMMY_CONSOLE_ROWS This only showed up after many thousand randconfig builds on Arm, and doesn't matter in practice, but should still be fixed. Address it by using the default row/columns on footbridge after all in that corner case. Fixes: 4293b09 ("dummycon: limit Arm console size hack to footbridge") Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202409151512.LML1slol-lkp@intel.com/ Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 9a14cac commit d3ea050

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/video/console/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ config DUMMY_CONSOLE
5252

5353
config DUMMY_CONSOLE_COLUMNS
5454
int "Initial number of console screen columns"
55-
depends on DUMMY_CONSOLE && !ARCH_FOOTBRIDGE
55+
depends on DUMMY_CONSOLE && !(ARCH_FOOTBRIDGE && VGA_CONSOLE)
5656
default 160 if PARISC
5757
default 80
5858
help
@@ -62,7 +62,7 @@ config DUMMY_CONSOLE_COLUMNS
6262

6363
config DUMMY_CONSOLE_ROWS
6464
int "Initial number of console screen rows"
65-
depends on DUMMY_CONSOLE && !ARCH_FOOTBRIDGE
65+
depends on DUMMY_CONSOLE && !(ARCH_FOOTBRIDGE && VGA_CONSOLE)
6666
default 64 if PARISC
6767
default 30 if ARM
6868
default 25

0 commit comments

Comments
 (0)