diff options
| author | Stefan Roese <sr@denx.de> | 2007-06-25 20:20:30 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-06-25 20:20:30 +0200 |
| commit | e4feb7638ca0a2138973f14456424acbc332ae43 (patch) | |
| tree | b69d9c1ecce5ad19ffa73b58e251974fcbf68025 /board/amcc | |
| parent | a1bd6200eccd3a02040a955d5f43d3ee1fc9f93b (diff) | |
| parent | 1636d1c8529c006d106287cfbc20cd0a246fe1cb (diff) | |
| download | blackbird-obmc-uboot-e4feb7638ca0a2138973f14456424acbc332ae43.tar.gz blackbird-obmc-uboot-e4feb7638ca0a2138973f14456424acbc332ae43.zip | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/amcc')
| -rw-r--r-- | board/amcc/acadia/acadia.c | 14 | ||||
| -rw-r--r-- | board/amcc/sequoia/sequoia.c | 10 |
2 files changed, 17 insertions, 7 deletions
diff --git a/board/amcc/acadia/acadia.c b/board/amcc/acadia/acadia.c index 0f54025fb2..8b82ea40ed 100644 --- a/board/amcc/acadia/acadia.c +++ b/board/amcc/acadia/acadia.c @@ -31,13 +31,13 @@ static void acadia_gpio_init(void) /* * GPIO0 setup (select GPIO or alternate function) */ - out32(GPIO0_OSRL, CFG_GPIO0_OSRL); - out32(GPIO0_OSRH, CFG_GPIO0_OSRH); /* output select */ - out32(GPIO0_ISR1L, CFG_GPIO0_ISR1L); - out32(GPIO0_ISR1H, CFG_GPIO0_ISR1H); /* input select */ - out32(GPIO0_TSRL, CFG_GPIO0_TSRL); - out32(GPIO0_TSRH, CFG_GPIO0_TSRH); /* three-state select */ - out32(GPIO0_TCR, CFG_GPIO0_TCR); /* enable output driver for outputs */ + out32(GPIO0_OSRL, CFG_GPIO0_OSRL); + out32(GPIO0_OSRH, CFG_GPIO0_OSRH); /* output select */ + out32(GPIO0_ISR1L, CFG_GPIO0_ISR1L); + out32(GPIO0_ISR1H, CFG_GPIO0_ISR1H); /* input select */ + out32(GPIO0_TSRL, CFG_GPIO0_TSRL); + out32(GPIO0_TSRH, CFG_GPIO0_TSRH); /* three-state select */ + out32(GPIO0_TCR, CFG_GPIO0_TCR); /* enable output driver for outputs */ /* * Ultra (405EZ) was nice enough to add another GPIO controller diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index a8966f0e5f..b437653950 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -573,3 +573,13 @@ int is_pci_host(struct pci_controller *hose) return (1); } #endif /* defined(CONFIG_PCI) */ +#if defined(CONFIG_POST) +/* + * Returns 1 if keys pressed to start the power-on long-running tests + * Called from board_init_f(). + */ +int post_hotkeys_pressed(void) +{ + return 0; /* No hotkeys supported */ +} +#endif /* CONFIG_POST */ |
