diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-05-21 01:13:39 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-05-21 01:13:39 +0200 |
| commit | eddc7c46c6030d6eca29ac254c9db98198be572d (patch) | |
| tree | c9cf18d225398fbbb11496ad61a79852d3e059ba /post/post.c | |
| parent | 4416603aeb06861b468b06a981e52c3ff805db7b (diff) | |
| parent | 0e15ddd11f1a84c465e434eb051d2ef08ef02b9b (diff) | |
| download | u-boot-imx-eddc7c46c6030d6eca29ac254c9db98198be572d.zip u-boot-imx-eddc7c46c6030d6eca29ac254c9db98198be572d.tar.gz u-boot-imx-eddc7c46c6030d6eca29ac254c9db98198be572d.tar.bz2 | |
Merge branch 'lwmon5' of /home/wd/git/u-boot/projects
Diffstat (limited to 'post/post.c')
| -rw-r--r-- | post/post.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/post/post.c b/post/post.c index c016c3a..d31829b 100644 --- a/post/post.c +++ b/post/post.c @@ -238,14 +238,20 @@ static int post_run_single (struct post_test *test, if (test_flags & POST_PREREL) { if ((*test->test) (flags) == 0) post_log_mark_succ ( test->testid ); - else if (test_flags & POST_CRITICAL) - gd->flags |= GD_FLG_POSTFAIL; + else { + if (test_flags & POST_CRITICAL) + gd->flags |= GD_FLG_POSTFAIL; + if (test_flags & POST_STOP) + gd->flags |= GD_FLG_POSTSTOP; + } } else { if ((*test->test) (flags) != 0) { post_log ("FAILED\n"); show_boot_progress (-32); if (test_flags & POST_CRITICAL) gd->flags |= GD_FLG_POSTFAIL; + if (test_flags & POST_STOP) + gd->flags |= GD_FLG_POSTSTOP; } else post_log ("PASSED\n"); @@ -271,6 +277,9 @@ int post_run (char *name, int flags) if (name == NULL) { unsigned int last; + if (gd->flags & GD_FLG_POSTSTOP) + return 0; + if (post_bootmode_get (&last) & POST_POWERTEST) { if (last & POST_FAIL_SAVE) { last &= ~POST_FAIL_SAVE; @@ -285,6 +294,8 @@ int post_run (char *name, int flags) flags | POST_REBOOT, last); for (i = last + 1; i < post_list_size; i++) { + if (gd->flags & GD_FLG_POSTSTOP) + break; post_run_single (post_list + i, test_flags[i], flags, i); @@ -292,6 +303,8 @@ int post_run (char *name, int flags) } } else { for (i = 0; i < post_list_size; i++) { + if (gd->flags & GD_FLG_POSTSTOP) + break; post_run_single (post_list + i, test_flags[i], flags, i); |