brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

Browse Source
This commit is contained in:
Wolfgang Denk 2011-05-10 22:30:07 +02:00
commit 909e9bf3ae
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/cpu/mpc83xx/cpu_init.c
View File

@ -326,8 +326,7 @@ void cpu_init_f (volatile immap_t * im)
im->gpio[1].dat = CONFIG_SYS_GPIO2_DAT; im->gpio[1].dat = CONFIG_SYS_GPIO2_DAT;
im->gpio[1].dir = CONFIG_SYS_GPIO2_DIR; im->gpio[1].dir = CONFIG_SYS_GPIO2_DIR;
#endif #endif
#ifdef CONFIG_USB_EHCI_FSL #if defined(CONFIG_USB_EHCI_FSL) && defined(CONFIG_MPC831x)
#ifndef CONFIG_MPC834x
uint32_t temp; uint32_t temp;
struct usb_ehci *ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR; 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); udelay(1000);
} while (!(temp & PHY_CLK_VALID)); } while (!(temp & PHY_CLK_VALID));
#endif #endif
#endif
} }
int cpu_init_r (void) int cpu_init_r (void)