From: Stefan Roese <sr@denx.de>
Date: Wed, 18 Apr 2007 10:07:47 +0000 (+0200)
Subject: ppc4xx: Update Acadia to not setup PLL when booting via bootstrap EEPROM
X-Git-Tag: v1.3.0-rc1~88^2~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e673226ff9d6aa91b47ceac74b8c13770b06bb37;p=oweals%2Fu-boot.git

ppc4xx: Update Acadia to not setup PLL when booting via bootstrap EEPROM

Signed-off-by: Stefan Roese <sr@denx.de>
---

diff --git a/board/amcc/acadia/acadia.c b/board/amcc/acadia/acadia.c
index 7d0046a22f..baf598c677 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);