diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-01-12 23:17:02 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-01-13 15:54:48 +0300 |
| commit | 8f5b1e6511b83ab5483dc5f8b60e2438e9c6dfbe (patch) | |
| tree | b3a7c0f89e8a1998b3611db2417590a7fc9052c0 /drivers/video/console/dummycon.c | |
| parent | 0fc50517cf2f9f580d7b54cb72dbc1e760aa8113 (diff) | |
| download | linux-8f5b1e6511b83ab5483dc5f8b60e2438e9c6dfbe.tar.xz | |
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>
Diffstat (limited to 'drivers/video/console/dummycon.c')
| -rw-r--r-- | drivers/video/console/dummycon.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c index 40bec8d64b0a..0efc52f11ad0 100644 --- a/drivers/video/console/dummycon.c +++ b/drivers/video/console/dummycon.c @@ -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) |