diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-04-18 16:06:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-04-18 16:06:05 +0200 |
| commit | 0f5642d7322740ad008a4c5eb0a131d64a6f7a0a (patch) | |
| tree | 129be3feb683cc3b54c259429c5b9fad75f5ffeb /board/amcc/acadia | |
| parent | ad4eb555671d97f96dc56eab55103b1f86874b01 (diff) | |
| parent | afc7e4c2a4729427bec672561ea1b3dbb5e8c0d3 (diff) | |
| download | u-boot-imx-0f5642d7322740ad008a4c5eb0a131d64a6f7a0a.zip u-boot-imx-0f5642d7322740ad008a4c5eb0a131d64a6f7a0a.tar.gz u-boot-imx-0f5642d7322740ad008a4c5eb0a131d64a6f7a0a.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Diffstat (limited to 'board/amcc/acadia')
| -rw-r--r-- | board/amcc/acadia/acadia.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/board/amcc/acadia/acadia.c b/board/amcc/acadia/acadia.c index 7d0046a..baf598c 100644 --- a/board/amcc/acadia/acadia.c +++ b/board/amcc/acadia/acadia.c @@ -26,7 +26,7 @@ extern void board_pll_init_f(void); -void liveoak_gpio_init(void) +static void acadia_gpio_init(void) { /* * GPIO0 setup (select GPIO or alternate function) @@ -55,8 +55,12 @@ int board_early_init_f(void) { unsigned int reg; - board_pll_init_f(); - liveoak_gpio_init(); + /* don't reinit PLL when booting via I2C bootstrap option */ + mfsdr(SDR_PINSTP, reg); + if (reg != 0xf0000000) + board_pll_init_f(); + + acadia_gpio_init(); /* USB Host core needs this bit set */ mfsdr(sdrultra1, reg); |