Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
This commit is contained in:
commit
909e9bf3ae
1 changed files with 1 additions and 3 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue