X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=post%2Fpost.c;h=8fef0c34127d2a635cbe83db5895ad1f819ff8a9;hb=5619295995e3262bb5770e8b5e945ffdc5442145;hp=4af5355fa5a20f9c2e763f37b269bea38d43e8ea;hpb=5b9c79a81db80c3f9e50c77477957cd803429af8;p=oweals%2Fu-boot.git diff --git a/post/post.c b/post/post.c index 4af5355fa5..8fef0c3412 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) { @@ -183,7 +180,7 @@ static void post_get_env_flags(int *test_flags) int i, j; for (i = 0; i < varnum; i++) { - if (getenv_f(var[i], list, sizeof(list)) <= 0) + if (env_get_f(var[i], list, sizeof(list)) <= 0) continue; for (j = 0; j < post_list_size; j++) @@ -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) @@ -479,7 +474,7 @@ void post_reloc(void) */ unsigned long post_time_ms(unsigned long base) { -#if defined(CONFIG_PPC) || defined(CONFIG_BLACKFIN) || defined(CONFIG_ARM) +#if defined(CONFIG_PPC) || defined(CONFIG_ARM) return (unsigned long)lldiv(get_ticks(), get_tbclk() / CONFIG_SYS_HZ) - base; #else