diff options
author | Stefan Roese <sr@denx.de> | 2007-07-04 08:11:37 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-07-04 08:11:37 +0200 |
commit | 8e990cb076a1c77daf3a50cc0df9732135e9eef5 (patch) | |
tree | 3b860d74bb4ddc5e0c9485e44da1bc0a08ed839c /board/amcc/sequoia/sequoia.c | |
parent | d677b32855f577ae2690dcd64a172cdd706e0ffc (diff) | |
parent | 98c440bee623ecdd5322852732b883e696fb2140 (diff) | |
download | blackbird-obmc-uboot-8e990cb076a1c77daf3a50cc0df9732135e9eef5.tar.gz blackbird-obmc-uboot-8e990cb076a1c77daf3a50cc0df9732135e9eef5.zip |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/amcc/sequoia/sequoia.c')
-rw-r--r-- | board/amcc/sequoia/sequoia.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index ba365aea31..b437653950 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -426,23 +426,10 @@ int testdram(void) * certain pre-initialization actions. * ************************************************************************/ -#if defined(CONFIG_PCI) && defined(CFG_PCI_PRE_INIT) +#if defined(CONFIG_PCI) int pci_pre_init(struct pci_controller *hose) { unsigned long addr; -#if 0 - /*--------------------------------------------------------------------------+ - * Cactus is always configured as the host & requires the - * PCI arbiter to be enabled ??? - *--------------------------------------------------------------------------*/ - unsigned long strap; - mfsdr(sdr_sdstp1, strap); - if ((strap & SDR0_SDSTP1_PAE_MASK) == 0) { - printf("PCI: SDR0_STRP1[PAE] not set.\n"); - printf("PCI: Configuration aborted.\n"); - return 0; - } -#endif /*-------------------------------------------------------------------------+ | Set priority for all PLB3 devices to 0. @@ -480,7 +467,7 @@ int pci_pre_init(struct pci_controller *hose) return 1; } -#endif /* defined(CONFIG_PCI) && defined(CFG_PCI_PRE_INIT) */ +#endif /* defined(CONFIG_PCI) */ /************************************************************************* * pci_target_init @@ -586,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 */ |