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 'master' of git://git.denx.de/u-boot-mpc85xx
[oweals/u-boot.git]
/
board
/
xes
/
xpedite5200
/
xpedite5200.c
diff --git
a/board/xes/xpedite5200/xpedite5200.c
b/board/xes/xpedite5200/xpedite5200.c
index 71097715155a34da728ba52f2f942c243e9dcd1a..a2627f8673604c1b89c2dd625cd0bf3365781981 100644
(file)
--- a/
board/xes/xpedite5200/xpedite5200.c
+++ b/
board/xes/xpedite5200/xpedite5200.c
@@
-38,7
+38,7
@@
extern void ft_board_pci_setup(void *blob, bd_t *bd);
int checkboard(void)
{
int checkboard(void)
{
- volatile
ccsr_lbc_t *lbc = (void *)(CONFIG_SYS_MPC85xx_LBC_ADDR)
;
+ volatile
fsl_lbc_t *lbc = LBC_BASE_ADDR
;
volatile ccsr_local_ecm_t *ecm = (void *)(CONFIG_SYS_MPC85xx_ECM_ADDR);
char *s;
volatile ccsr_local_ecm_t *ecm = (void *)(CONFIG_SYS_MPC85xx_ECM_ADDR);
char *s;
@@
-65,7
+65,6
@@
int checkboard(void)
static void flash_cs_fixup(void)
{
static void flash_cs_fixup(void)
{
- volatile ccsr_lbc_t *lbc = (void *)(CONFIG_SYS_MPC85xx_LBC_ADDR);
int flash_sel;
/*
int flash_sel;
/*
@@
-78,11
+77,11
@@
static void flash_cs_fixup(void)
printf("FLASH: Executed from FLASH%d\n", flash_sel ? 2 : 1);
if (flash_sel) {
printf("FLASH: Executed from FLASH%d\n", flash_sel ? 2 : 1);
if (flash_sel) {
-
out_be32(&lbc->br
0, CONFIG_SYS_BR1_PRELIM);
-
out_be32(&lbc->or
0, CONFIG_SYS_OR1_PRELIM);
+
set_lbc_br(
0, CONFIG_SYS_BR1_PRELIM);
+
set_lbc_or(
0, CONFIG_SYS_OR1_PRELIM);
-
out_be32(&lbc->br
1, CONFIG_SYS_BR0_PRELIM);
-
out_be32(&lbc->or
1, CONFIG_SYS_OR0_PRELIM);
+
set_lbc_br(
1, CONFIG_SYS_BR0_PRELIM);
+
set_lbc_or(
1, CONFIG_SYS_OR0_PRELIM);
}
}
}
}