diff options
| author | Peter Tyser <ptyser@xes-inc.com> | 2010-09-14 19:13:50 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-23 21:14:42 +0200 |
| commit | 6aa3d3bfaa986f1aff5e21a9b9f68d087715b1a9 (patch) | |
| tree | d7fa66dbe49f468f0efaa94a0ad03507b46976f6 /board/freescale/mpc8313erdb | |
| parent | 9eda770b460161e6d6112c67cec0f46ec8d44921 (diff) | |
| download | blackbird-obmc-uboot-6aa3d3bfaa986f1aff5e21a9b9f68d087715b1a9.tar.gz blackbird-obmc-uboot-6aa3d3bfaa986f1aff5e21a9b9f68d087715b1a9.zip | |
83xx: Remove warmboot parameter from PCI init functions
This change lays the groundwork for the BOOTFLAG_* flags being removed.
This change has the small affect of delaying 100ms on PCI initialization
after a warm boot as opposed to the optimal 1ms on some boards.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
included the mpc8308_p1m board.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Diffstat (limited to 'board/freescale/mpc8313erdb')
| -rw-r--r-- | board/freescale/mpc8313erdb/mpc8313erdb.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c index e5f62ae965..08f873d7e4 100644 --- a/board/freescale/mpc8313erdb/mpc8313erdb.c +++ b/board/freescale/mpc8313erdb/mpc8313erdb.c @@ -80,7 +80,6 @@ void pci_init_board(void) volatile clk83xx_t *clk = (volatile clk83xx_t *)&immr->clk; volatile law83xx_t *pci_law = immr->sysconf.pcilaw; struct pci_region *reg[] = { pci_regions }; - int warmboot; /* Enable all 3 PCI_CLK_OUTPUTs. */ clk->occr |= 0xe0000000; @@ -94,12 +93,7 @@ void pci_init_board(void) pci_law[1].bar = CONFIG_SYS_PCI1_IO_PHYS & LAWBAR_BAR; pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB; - warmboot = gd->bd->bi_bootflags & BOOTFLAG_WARM; -#ifndef CONFIG_SYS_8313ERDB_BROKEN_PMC - warmboot |= immr->pmc.pmccr1 & PMCCR1_POWER_OFF; -#endif - - mpc83xx_pci_init(1, reg, warmboot); + mpc83xx_pci_init(1, reg); } /* |
