projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
[oweals/u-boot.git]
/
post
/
post.c
diff --git
a/post/post.c
b/post/post.c
index 4af5355fa5a20f9c2e763f37b269bea38d43e8ea..4194edb89e86fe2db008767dd33bd7faf4e32b79 100644
(file)
--- 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.
*/
* 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;
{
#ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
int ret;
@@
-73,9
+73,6
@@
int __post_hotkeys_pressed(void)
return 0; /* No hotkeys supported */
}
return 0; /* No hotkeys supported */
}
-int post_hotkeys_pressed(void)
- __attribute__((weak, alias("__post_hotkeys_pressed")));
-
void post_bootmode_init(void)
{
void post_bootmode_init(void)
{
@@
-236,11
+233,9
@@
static void post_get_flags(int *test_flags)
test_flags[j] |= POST_SLOWTEST;
}
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)
static int post_run_single(struct post_test *test,
int test_flags, int flags, unsigned int i)