Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

console/dummy: Move screen size selection from CPP to Kconfig

PA-RISC already handled the dummy console screen size selection in
Kconfig, so generalize this to other platforms.

ARM keeps on using screen_info, which is filled in by
platform-specific code, or from ATAGS.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

authored by

Geert Uytterhoeven and committed by
Tomi Valkeinen
8f5b1e65 0fc50517

+11 -10
+10 -6
drivers/video/console/Kconfig
··· 77 77 78 78 config DUMMY_CONSOLE_COLUMNS 79 79 int "Initial number of console screen columns" 80 - depends on PARISC && DUMMY_CONSOLE 81 - default "160" 80 + depends on DUMMY_CONSOLE && !ARM 81 + default 160 if PARISC 82 + default 80 82 83 help 83 - The default value is 160, which should fit a 1280x1024 monitor. 84 + On PA-RISC, the default value is 160, which should fit a 1280x1024 85 + monitor. 84 86 Select 80 if you use a 640x480 resolution by default. 85 87 86 88 config DUMMY_CONSOLE_ROWS 87 89 int "Initial number of console screen rows" 88 - depends on PARISC && DUMMY_CONSOLE 89 - default "64" 90 + depends on DUMMY_CONSOLE && !ARM 91 + default 64 if PARISC 92 + default 25 90 93 help 91 - The default value is 64, which should fit a 1280x1024 monitor. 94 + On PA-RISC, the default value is 64, which should fit a 1280x1024 95 + monitor. 92 96 Select 25 if you use a 640x480 resolution by default. 93 97 94 98 config FRAMEBUFFER_CONSOLE
+1 -4
drivers/video/console/dummycon.c
··· 20 20 #if defined(__arm__) 21 21 #define DUMMY_COLUMNS screen_info.orig_video_cols 22 22 #define DUMMY_ROWS screen_info.orig_video_lines 23 - #elif defined(__hppa__) 23 + #else 24 24 /* set by Kconfig. Use 80x25 for 640x480 and 160x64 for 1280x1024 */ 25 25 #define DUMMY_COLUMNS CONFIG_DUMMY_CONSOLE_COLUMNS 26 26 #define DUMMY_ROWS CONFIG_DUMMY_CONSOLE_ROWS 27 - #else 28 - #define DUMMY_COLUMNS 80 29 - #define DUMMY_ROWS 25 30 27 #endif 31 28 32 29 static const char *dummycon_startup(void)