Patchwork [U-Boot] common:splash: use __weak

login
register
mail settings
Submitter Jeroen Hofstee
Date June 26, 2014, 5:53 p.m.
Message ID <1403805196-346-1-git-send-email-jeroen@myspectrum.nl>
Download mbox | patch
Permalink /patch/364629/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Jeroen Hofstee - June 26, 2014, 5:53 p.m.
This not only looks a bit better it also prevents a
warning with W=1 (no previous prototype).

cc: agust@denx.de
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
---
 common/splash.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
Tom Rini - July 21, 2014, 8:42 p.m.
On Thu, Jun 26, 2014 at 07:53:16PM +0200, Jeroen Hofstee wrote:

> This not only looks a bit better it also prevents a
> warning with W=1 (no previous prototype).
> 
> cc: agust@denx.de
> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>

Applied to u-boot/master, thanks!

Patch

diff --git a/common/splash.c b/common/splash.c
index 18885f1..144fb10 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -23,15 +23,11 @@ 
 #include <common.h>
 #include <splash.h>
 
-int __splash_screen_prepare(void)
+__weak int splash_screen_prepare(void)
 {
 	return 0;
 }
 
-int splash_screen_prepare(void)
-	__attribute__ ((weak, alias("__splash_screen_prepare")));
-
-
 #ifdef CONFIG_SPLASH_SCREEN_ALIGN
 void splash_get_pos(int *x, int *y)
 {