diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-16 22:13:45 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-16 22:13:45 +0200 |
| commit | 10faafd5ff103ee493b6a05724eb605d09836d4a (patch) | |
| tree | 14139db1b9cee16996d6cc058e28730350e47ad4 /cpu | |
| parent | 6973fb414c36b25b4622917d6a223510be0678f5 (diff) | |
| parent | 4a9932a4364b548773bc131bf85e24a2ec15f2b0 (diff) | |
| download | u-boot-imx-10faafd5ff103ee493b6a05724eb605d09836d4a.zip u-boot-imx-10faafd5ff103ee493b6a05724eb605d09836d4a.tar.gz u-boot-imx-10faafd5ff103ee493b6a05724eb605d09836d4a.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc83xx/cpu_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpu/mpc83xx/cpu_init.c b/cpu/mpc83xx/cpu_init.c index 03b6c86..5c930d3 100644 --- a/cpu/mpc83xx/cpu_init.c +++ b/cpu/mpc83xx/cpu_init.c @@ -299,6 +299,7 @@ void cpu_init_f (volatile immap_t * im) im->gpio[1].dir = CONFIG_SYS_GPIO2_DIR; #endif #ifdef CONFIG_USB_EHCI_FSL +#ifndef CONFIG_MPC834x uint32_t temp; struct usb_ehci *ehci = (struct usb_ehci *)CONFIG_SYS_MPC8xxx_USB_ADDR; @@ -311,6 +312,7 @@ void cpu_init_f (volatile immap_t * im) udelay(1000); } while (!(temp & PHY_CLK_VALID)); #endif +#endif } int cpu_init_r (void) |