summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-05-10 22:30:07 +0200
committerWolfgang Denk <wd@denx.de>2011-05-10 22:30:07 +0200
commit909e9bf3ae6195ac6d52f9e453fba2be8e7e947f (patch)
treefae0df26725a33ee28b6a32ccdba51dbef8e0940 /arch/powerpc
parent96d04c3150ae9284500aef48803d7d132968f2b2 (diff)
parent84d2e03f9d629fe3796d577d4759388699b926ad (diff)
downloadu-boot-imx-909e9bf3ae6195ac6d52f9e453fba2be8e7e947f.zip
u-boot-imx-909e9bf3ae6195ac6d52f9e453fba2be8e7e947f.tar.gz
u-boot-imx-909e9bf3ae6195ac6d52f9e453fba2be8e7e947f.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/cpu/mpc83xx/cpu_init.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index 7a1cae7..76afba5 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -326,8 +326,7 @@ void cpu_init_f (volatile immap_t * im)
im->gpio[1].dat = CONFIG_SYS_GPIO2_DAT;
im->gpio[1].dir = CONFIG_SYS_GPIO2_DIR;
#endif
-#ifdef CONFIG_USB_EHCI_FSL
-#ifndef CONFIG_MPC834x
+#if defined(CONFIG_USB_EHCI_FSL) && defined(CONFIG_MPC831x)
uint32_t temp;
struct usb_ehci *ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR;
@@ -340,7 +339,6 @@ void cpu_init_f (volatile immap_t * im)
udelay(1000);
} while (!(temp & PHY_CLK_VALID));
#endif
-#endif
}
int cpu_init_r (void)