Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a91c406c authored by Finn Thain's avatar Finn Thain Committed by Geert Uytterhoeven
Browse files

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: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent cfbf8d48

arch/m68k/kernel/head.S

+6 −7
Original line number Diff line number Diff line
@@ -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