projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
96d04c3
)
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
author
Wolfgang Denk
<wd@denx.de>
Tue, 10 May 2011 20:30:07 +0000
(22:30 +0200)
committer
Wolfgang Denk
<wd@denx.de>
Tue, 10 May 2011 20:30:07 +0000
(22:30 +0200)
arch/powerpc/cpu/mpc83xx/cpu_init.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/cpu/mpc83xx/cpu_init.c
b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index
7a1cae7
..
76afba5
100644
(file)
--- 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)