projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc83xx
/
cpu_init.c
diff --git
a/arch/powerpc/cpu/mpc83xx/cpu_init.c
b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index d568f889d2fc29e69c9f5587c70911d46d0c32bf..00572de121d51dbe90946f51c27e915358de2ed2 100644
(file)
--- a/
arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/
arch/powerpc/cpu/mpc83xx/cpu_init.c
@@
-315,7
+315,7
@@
void cpu_init_f (volatile immap_t * im)
#endif
#if defined(CONFIG_USB_EHCI_FSL) && defined(CONFIG_MPC831x)
uint32_t temp;
#endif
#if defined(CONFIG_USB_EHCI_FSL) && defined(CONFIG_MPC831x)
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
1
_ADDR;
/* Configure interface. */
setbits_be32(&ehci->control, REFSEL_16MHZ | UTMI_PHY_EN);
/* Configure interface. */
setbits_be32(&ehci->control, REFSEL_16MHZ | UTMI_PHY_EN);
@@
-425,15
+425,15
@@
static int print_83xx_arb_event(int force)
};
int etype = (gd->arch.arbiter_event_attributes & AEATR_EVENT)
};
int etype = (gd->arch.arbiter_event_attributes & AEATR_EVENT)
- >> AEATR_EVENT_SHIFT;
+ >> AEATR_EVENT_SHIFT;
int mstr_id = (gd->arch.arbiter_event_attributes & AEATR_MSTR_ID)
int mstr_id = (gd->arch.arbiter_event_attributes & AEATR_MSTR_ID)
- >> AEATR_MSTR_ID_SHIFT;
+ >> AEATR_MSTR_ID_SHIFT;
int tbst = (gd->arch.arbiter_event_attributes & AEATR_TBST)
int tbst = (gd->arch.arbiter_event_attributes & AEATR_TBST)
- >> AEATR_TBST_SHIFT;
+ >> AEATR_TBST_SHIFT;
int tsize = (gd->arch.arbiter_event_attributes & AEATR_TSIZE)
int tsize = (gd->arch.arbiter_event_attributes & AEATR_TSIZE)
- >> AEATR_TSIZE_SHIFT;
+ >> AEATR_TSIZE_SHIFT;
int ttype = (gd->arch.arbiter_event_attributes & AEATR_TTYPE)
int ttype = (gd->arch.arbiter_event_attributes & AEATR_TTYPE)
- >> AEATR_TTYPE_SHIFT;
+ >> AEATR_TTYPE_SHIFT;
if (!force && !gd->arch.arbiter_event_address)
return 0;
if (!force && !gd->arch.arbiter_event_address)
return 0;