diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-07-13 21:39:13 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-07-13 21:39:13 +0200 |
| commit | bc2962482b707e44e0b43d20bd4dcf2a40230abb (patch) | |
| tree | 751c5e07c5ff0aa7910da0fe33b0a0996bda518c /board/amcc/acadia/memory.c | |
| parent | 093172f08d6afb3f34d8a2f26ee0ee874261cf27 (diff) | |
| parent | 239f05ee4dd4cfe0b50f251b533dcebe9e67c360 (diff) | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'board/amcc/acadia/memory.c')
| -rw-r--r-- | board/amcc/acadia/memory.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/board/amcc/acadia/memory.c b/board/amcc/acadia/memory.c index 25904d3b94..9346d2c52f 100644 --- a/board/amcc/acadia/memory.c +++ b/board/amcc/acadia/memory.c @@ -31,6 +31,8 @@ #include <asm/io.h> #include <asm/gpio.h> +extern void board_pll_init_f(void); + /* * sdram_init - Dummy implementation for start.S, spd_sdram used on this board! */ @@ -67,6 +69,15 @@ static void cram_bcr_write(u32 wr_val) long int initdram(int board_type) { +#if defined(CONFIG_NAND_SPL) + u32 reg; + + /* don't reinit PLL when booting via I2C bootstrap option */ + mfsdr(SDR_PINSTP, reg); + if (reg != 0xf0000000) + board_pll_init_f(); +#endif + #if !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) int i; u32 val; |