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>
This commit is contained in:
parent
cfbf8d4857
commit
a91c406c74
|
@ -275,7 +275,6 @@
|
||||||
|
|
||||||
#ifdef CONFIG_FRAMEBUFFER_CONSOLE
|
#ifdef CONFIG_FRAMEBUFFER_CONSOLE
|
||||||
#define CONSOLE
|
#define CONSOLE
|
||||||
#define CONSOLE_PENGUIN
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_EARLY_PRINTK
|
#ifdef CONFIG_EARLY_PRINTK
|
||||||
|
@ -907,15 +906,15 @@ L(nothp):
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_MAC
|
#ifdef CONFIG_MAC
|
||||||
is_not_mac(L(nocon))
|
is_not_mac(L(nocon))
|
||||||
#ifdef CONSOLE
|
# ifdef CONSOLE
|
||||||
console_init
|
console_init
|
||||||
#ifdef CONSOLE_PENGUIN
|
# ifdef CONFIG_LOGO
|
||||||
console_put_penguin
|
console_put_penguin
|
||||||
#endif /* CONSOLE_PENGUIN */
|
# endif /* CONFIG_LOGO */
|
||||||
console_put_stats
|
console_put_stats
|
||||||
#endif /* CONSOLE */
|
# endif /* CONSOLE */
|
||||||
L(nocon):
|
L(nocon):
|
||||||
#endif /* CONFIG_MAC */
|
#endif /* CONFIG_MAC */
|
||||||
|
|
||||||
|
|
||||||
putc '\n'
|
putc '\n'
|
||||||
|
@ -3456,7 +3455,7 @@ func_start console_put_stats,%a0/%d7
|
||||||
|
|
||||||
func_return console_put_stats
|
func_return console_put_stats
|
||||||
|
|
||||||
#ifdef CONSOLE_PENGUIN
|
#ifdef CONFIG_LOGO
|
||||||
func_start console_put_penguin,%a0-%a1/%d0-%d7
|
func_start console_put_penguin,%a0-%a1/%d0-%d7
|
||||||
/*
|
/*
|
||||||
* Get 'that_penguin' onto the screen in the upper right corner
|
* Get 'that_penguin' onto the screen in the upper right corner
|
||||||
|
|
Loading…
Reference in a new issue