diff options
| author | wdenk <wdenk> | 2003-07-15 07:45:49 +0000 | 
|---|---|---|
| committer | wdenk <wdenk> | 2003-07-15 07:45:49 +0000 | 
| commit | 6dff55297283ebe16096e25f2dadb54e4b6fd9fc (patch) | |
| tree | 6fa76fdf7ddc26e5728c3b318fe7addbf04ae673 /post/post.c | |
| parent | 8564acf936726c5568d71e4fa93a0ae9814e0d07 (diff) | |
| download | olio-uboot-2014.01-6dff55297283ebe16096e25f2dadb54e4b6fd9fc.tar.xz olio-uboot-2014.01-6dff55297283ebe16096e25f2dadb54e4b6fd9fc.zip | |
* Patches by Martin Krause, 14 Jul 2003:
  - add I2C support for s3c2400 systems (trab board)
  - (re-) add "ping" to command table
* Fix handling of "slow" POST routines
Diffstat (limited to 'post/post.c')
| -rw-r--r-- | post/post.c | 17 | 
1 files changed, 10 insertions, 7 deletions
| diff --git a/post/post.c b/post/post.c index 323447d1b..0474f1f75 100644 --- a/post/post.c +++ b/post/post.c @@ -65,9 +65,11 @@ void post_bootmode_init (void)  	DECLARE_GLOBAL_DATA_PTR;  	int bootmode = post_bootmode_get (0); -	if (bootmode == 0) { +	if (post_hotkeys_pressed(gd) && !(bootmode & POST_POWERTEST)) { +		bootmode = POST_SLOWTEST; +	} else if (bootmode == 0) {  		bootmode = POST_POWERON; -	} else if (bootmode == POST_POWERON) { +	} else if (bootmode == POST_POWERON || bootmode == POST_SLOWTEST) {  		bootmode = POST_NORMAL;  	} else {  		return; @@ -96,11 +98,6 @@ int post_bootmode_get (unsigned int *last_test)  	return bootmode;  } -void post_bootmode_clear (void) -{ -	post_word_store (0); -} -  /* POST tests run before relocation only mark status bits .... */  static void post_log_mark_start ( unsigned long testid )  { @@ -203,6 +200,12 @@ static void post_get_flags (int *test_flags)  			name = s + 1;  		}  	} + +	for (j = 0; j < post_list_size; j++) { +		if (test_flags[j] & POST_POWERON) { +			test_flags[j] |= POST_SLOWTEST; +		} +	}  }  static int post_run_single (struct post_test *test, |