summaryrefslogtreecommitdiffstats
path: root/post/uart.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-01-20 23:12:12 +0000
committerwdenk <wdenk>2004-01-20 23:12:12 +0000
commitc837dcb1a316745092567bfe4fb266d0941884ff (patch)
tree8b275e8c982d1b0a411ff33c08c86cd3d343eed6 /post/uart.c
parentb0aef11c9f1f98d018adaa484f1e048fa626801e (diff)
downloadblackbird-obmc-uboot-c837dcb1a316745092567bfe4fb266d0941884ff.tar.gz
blackbird-obmc-uboot-c837dcb1a316745092567bfe4fb266d0941884ff.zip
* The PS/2 mux on the BMS2003 board needs 450 ms after power on
before we can access it; add delay in case we are faster (with no CF card inserted) * Cleanup of some init functions * Make sure SCC Ethernet is always stopped by the time we boot Linux to avoid Linux crashes by early packets coming in. * Accelerate flash accesses on LWMON board by using buffered writes
Diffstat (limited to 'post/uart.c')
-rw-r--r--post/uart.c21
1 files changed, 3 insertions, 18 deletions
diff --git a/post/uart.c b/post/uart.c
index 15df74eef4..f6936ca7fc 100644
--- a/post/uart.c
+++ b/post/uart.c
@@ -72,17 +72,14 @@ static struct {
static char *ctlr_name[2] = { "SMC", "SCC" };
static int used_by_uart[2] = { -1, -1 };
-#if defined(SCC_ENET)
-static int used_by_ether[2] = { -1, -1 };
-#endif
static int proff_smc[] = { PROFF_SMC1, PROFF_SMC2 };
static int proff_scc[] =
{ PROFF_SCC1, PROFF_SCC2, PROFF_SCC3, PROFF_SCC4 };
- /*
- * SMC callbacks
- */
+/*
+ * SMC callbacks
+ */
static void smc_init (int smc_index)
{
@@ -523,14 +520,6 @@ static int test_ctlr (int ctlr, int index)
}
#endif
-#if defined(SCC_ENET)
- if (used_by_ether[ctlr] == index) {
- DECLARE_GLOBAL_DATA_PTR;
-
- eth_init (gd->bd);
- }
-#endif
-
if (res != 0) {
post_log ("uart %s%d test failed\n",
ctlr_name[ctlr], index + 1);
@@ -558,10 +547,6 @@ int uart_post_test (int flags)
used_by_uart[CTLR_SCC] = 3;
#endif
-#if defined(SCC_ENET)
- used_by_ether[CTLR_SCC] = SCC_ENET;
-#endif
-
ctlr_proc[CTLR_SMC].init = smc_init;
ctlr_proc[CTLR_SMC].putc = smc_putc;
ctlr_proc[CTLR_SMC].getc = smc_getc;
OpenPOWER on IntegriCloud