Commit 8f5b1e65 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Tomi Valkeinen
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 0fc50517

drivers/video/console/Kconfig

+10 −6
Original line number Diff line number Diff line
@@ -77,18 +77,22 @@ config DUMMY_CONSOLE 


config DUMMY_CONSOLE_COLUMNS

        int "Initial number of console screen columns"

        depends on PARISC && DUMMY_CONSOLE

        default "160"

        depends on DUMMY_CONSOLE && !ARM

        default 160 if PARISC

        default 80

        help

          The default value is 160, which should fit a 1280x1024 monitor.

          On PA-RISC, the default value is 160, which should fit a 1280x1024

          monitor.

          Select 80 if you use a 640x480 resolution by default.



config DUMMY_CONSOLE_ROWS

        int "Initial number of console screen rows"

        depends on PARISC && DUMMY_CONSOLE

        default "64"

        depends on DUMMY_CONSOLE && !ARM

        default 64 if PARISC

        default 25

        help

          The default value is 64, which should fit a 1280x1024 monitor.

          On PA-RISC, the default value is 64, which should fit a 1280x1024

          monitor.

          Select 25 if you use a 640x480 resolution by default.



config FRAMEBUFFER_CONSOLE

drivers/video/console/dummycon.c

+1 −4
Original line number Diff line number Diff line
@@ -20,13 +20,10 @@ 
#if defined(__arm__)

#define DUMMY_COLUMNS	screen_info.orig_video_cols

#define DUMMY_ROWS	screen_info.orig_video_lines

#elif defined(__hppa__)

#else

/* set by Kconfig. Use 80x25 for 640x480 and 160x64 for 1280x1024 */

#define DUMMY_COLUMNS	CONFIG_DUMMY_CONSOLE_COLUMNS

#define DUMMY_ROWS	CONFIG_DUMMY_CONSOLE_ROWS

#else

#define DUMMY_COLUMNS	80

#define DUMMY_ROWS	25

#endif



static const char *dummycon_startup(void)