[U-Boot] [PATCH 05/49] misc: use __weak

Jeroen Hofstee
2014-10-08T20:57:25Z

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
---
common/menu.c | 5 +----
post/post.c | 9 ++-------
2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/common/menu.c b/common/menu.c
index 94afeb2..e81c074 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -105,12 +105,9 @@ static inline void *menu_item_destroy(struct menu *m,
return NULL;
}

-void __menu_display_statusline(struct menu *m)
+__weak void menu_display_statusline(struct menu *m)
{
- return;
}
-void menu_display_statusline(struct menu *m)
- __attribute__ ((weak, alias("__menu_display_statusline")));

/*
* Display a menu so the user can make a choice of an item. First display its
diff --git a/post/post.c b/post/post.c
index 4af5355..4194edb 100644
--- a/post/post.c
+++ b/post/post.c
@@ -52,7 +52,7 @@ int post_init_f(void)
* Boards with hotkey support can override this weak default function
* by defining one in their board specific code.
*/
-int __post_hotkeys_pressed(void)
+__weak int post_hotkeys_pressed(void)
{
#ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
int ret;
@@ -73,9 +73,6 @@ int __post_hotkeys_pressed(void)

return 0; /* No hotkeys supported */
}
-int post_hotkeys_pressed(void)
- __attribute__((weak, alias("__post_hotkeys_pressed")));
-

void post_bootmode_init(void)
{
@@ -236,11 +233,9 @@ static void post_get_flags(int *test_flags)
test_flags[j] |= POST_SLOWTEST;
}

-void __show_post_progress(unsigned int test_num, int before, int result)
+__weak void show_post_progress(unsigned int test_num, int before, int result)
{
}
-void show_post_progress(unsigned int, int, int)
- __attribute__((weak, alias("__show_post_progress")));

static int post_run_single(struct post_test *test,
int test_flags, int flags, unsigned int i)
--
2.1.0