X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=post%2Fpost.c;h=b3ed2e1b49819fb488587136c1dab9a79cf2bce1;hb=73fe07a79a65600acce3d96c0b0d6ad1ca3e8551;hp=8705b12f03833405643d72d70e6ee4204627c1b8;hpb=e9d44b35beb45869863f3ca6929089d9df4df3e5;p=u-boot diff --git a/post/post.c b/post/post.c index 8705b12f03..b3ed2e1b49 100644 --- a/post/post.c +++ b/post/post.c @@ -158,7 +158,7 @@ void post_output_backlog(void) post_log("PASSED\n"); else { post_log("FAILED\n"); - show_boot_progress(-31); + bootstage_error(BOOTSTAGE_ID_POST_FAIL_R); } } } @@ -295,7 +295,7 @@ static int post_run_single(struct post_test *test, } else { if ((*test->test)(flags) != 0) { post_log("FAILED\n"); - show_boot_progress(-32); + bootstage_error(BOOTSTAGE_ID_POST_FAIL_R); show_post_progress(i, POST_AFTER, POST_FAILED); if (test_flags & POST_CRITICAL) gd->flags |= GD_FLG_POSTFAIL; @@ -495,8 +495,7 @@ void post_reloc(void) */ unsigned long post_time_ms(unsigned long base) { -#if defined(CONFIG_PPC) || defined(CONFIG_BLACKFIN) || \ - (defined(CONFIG_ARM) && !defined(CONFIG_KIRKWOOD)) +#if defined(CONFIG_PPC) || defined(CONFIG_BLACKFIN) || defined(CONFIG_ARM) return (unsigned long)lldiv(get_ticks(), get_tbclk() / CONFIG_SYS_HZ) - base; #else