diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-07-16 23:15:01 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-07-16 23:15:01 +0200 |
| commit | b6c208ab1ebc2ac01e0029b8456210617ff67156 (patch) | |
| tree | 65c1252178febcb70a5fc75e67748ceec8fe96e5 /board/xes/xpedite5200/xpedite5200.c | |
| parent | 16909f34b76e89871c0da528d6fe2ebf4e32231e (diff) | |
| parent | 9f43d7997e9c5395eed4eddd32cd75942896a412 (diff) | |
| download | olio-uboot-2014.01-b6c208ab1ebc2ac01e0029b8456210617ff67156.tar.xz olio-uboot-2014.01-b6c208ab1ebc2ac01e0029b8456210617ff67156.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/xes/xpedite5200/xpedite5200.c')
| -rw-r--r-- | board/xes/xpedite5200/xpedite5200.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/board/xes/xpedite5200/xpedite5200.c b/board/xes/xpedite5200/xpedite5200.c index 710977151..a2627f867 100644 --- 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) { - 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; @@ -65,7 +65,6 @@ int checkboard(void) static void flash_cs_fixup(void) { - volatile ccsr_lbc_t *lbc = (void *)(CONFIG_SYS_MPC85xx_LBC_ADDR); 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) { - out_be32(&lbc->br0, CONFIG_SYS_BR1_PRELIM); - out_be32(&lbc->or0, CONFIG_SYS_OR1_PRELIM); + set_lbc_br(0, CONFIG_SYS_BR1_PRELIM); + set_lbc_or(0, CONFIG_SYS_OR1_PRELIM); - out_be32(&lbc->br1, CONFIG_SYS_BR0_PRELIM); - out_be32(&lbc->or1, CONFIG_SYS_OR0_PRELIM); + set_lbc_br(1, CONFIG_SYS_BR0_PRELIM); + set_lbc_or(1, CONFIG_SYS_OR0_PRELIM); } } |