redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

m68k: Remove CONSOLE_PENGUIN macro, adopt CONFIG_LOGO

Browse source 
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:
Finn Thain 2014-02-15 15:45:29 +11:00 committed by Geert Uytterhoeven
parent cfbf8d4857
commit a91c406c74
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/m68k/kernel/head.S
View file

@ -275,7 +275,6 @@
#ifdef CONFIG_FRAMEBUFFER_CONSOLE
#define CONSOLE
#define CONSOLE_PENGUIN
#endif
#ifdef CONFIG_EARLY_PRINTK
@ -909,9 +908,9 @@ L(nothp):
is_not_mac(L(nocon))
# ifdef CONSOLE
console_init
#ifdef CONSOLE_PENGUIN
# ifdef CONFIG_LOGO
console_put_penguin
#endif /* CONSOLE_PENGUIN */
# endif /* CONFIG_LOGO */
console_put_stats
# endif /* CONSOLE */
L(nocon):
@ -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