diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2014-02-15 15:45:29 +1100 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-03-10 21:15:06 +0100 |
| commit | a91c406c742b3fc28969ec3316c9588acde66e5a (patch) | |
| tree | 90eb129b7608f57b3ee6b3b1336945cf9c93d980 /arch/m68k | |
| parent | cfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff) | |
| download | linux-a91c406c742b3fc28969ec3316c9588acde66e5a.tar.bz2 | |
m68k: Remove CONSOLE_PENGUIN macro, adopt CONFIG_LOGO
Allow CONFIG_LOGO to enable/disable the head.S penguin logo as well as the
framebuffer console logo. This should save a few bytes. It also gets rid
of the obscure CONSOLE_PENGUIN macro.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/kernel/head.S | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S index 4c99bab7e664..cea4af91cbd3 100644 --- a/arch/m68k/kernel/head.S +++ b/arch/m68k/kernel/head.S @@ -275,7 +275,6 @@ #ifdef CONFIG_FRAMEBUFFER_CONSOLE #define CONSOLE -#define CONSOLE_PENGUIN #endif #ifdef CONFIG_EARLY_PRINTK @@ -907,15 +906,15 @@ L(nothp): */ #ifdef CONFIG_MAC is_not_mac(L(nocon)) -#ifdef CONSOLE +# ifdef CONSOLE console_init -#ifdef CONSOLE_PENGUIN +# ifdef CONFIG_LOGO console_put_penguin -#endif /* CONSOLE_PENGUIN */ +# endif /* CONFIG_LOGO */ console_put_stats -#endif /* CONSOLE */ +# endif /* CONSOLE */ L(nocon): -#endif /* CONFIG_MAC */ +#endif /* CONFIG_MAC */ putc '\n' @@ -3456,7 +3455,7 @@ func_start console_put_stats,%a0/%d7 func_return console_put_stats -#ifdef CONSOLE_PENGUIN +#ifdef CONFIG_LOGO func_start console_put_penguin,%a0-%a1/%d0-%d7 /* * Get 'that_penguin' onto the screen in the upper right corner |