summaryrefslogtreecommitdiff
path: root/lib_ppc/board.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-07-15 07:45:49 +0000
committerwdenk <wdenk>2003-07-15 07:45:49 +0000
commit6dff55297283ebe16096e25f2dadb54e4b6fd9fc (patch)
tree6fa76fdf7ddc26e5728c3b318fe7addbf04ae673 /lib_ppc/board.c
parent8564acf936726c5568d71e4fa93a0ae9814e0d07 (diff)
downloadu-boot-imx-6dff55297283ebe16096e25f2dadb54e4b6fd9fc.zip
u-boot-imx-6dff55297283ebe16096e25f2dadb54e4b6fd9fc.tar.gz
u-boot-imx-6dff55297283ebe16096e25f2dadb54e4b6fd9fc.tar.bz2
* 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 'lib_ppc/board.c')
-rw-r--r--lib_ppc/board.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 108244e..a9b959b 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -526,10 +526,7 @@ void board_init_f (ulong bootflag)
#ifdef CONFIG_POST
post_bootmode_init();
- if (post_hotkeys_pressed(gd)) /* Force the long-running tests (memory) */
- post_run (NULL, POST_ROM | POST_SLOWTEST);
- else
- post_run (NULL, POST_ROM | post_bootmode_get(0));
+ post_run (NULL, POST_ROM | post_bootmode_get(0));
#endif
WATCHDOG_RESET();
@@ -900,14 +897,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif
#ifdef CONFIG_POST
- if (gd->post_hotkeys_latch)
- post_run (NULL, POST_RAM | POST_SLOWTEST);
- else
- post_run (NULL, POST_RAM | post_bootmode_get(0));
- if (post_bootmode_get(0) & POST_SLOWTEST) {
- post_bootmode_clear();
- board_poweroff();
- }
+ post_run (NULL, POST_RAM | post_bootmode_get(0));
#endif
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) && !(CONFIG_COMMANDS & CFG_CMD_IDE)