diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-11-28 05:25:02 (GMT) |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-12-12 04:34:19 (GMT) |
commit | f59b55a5b8fcadaa99781ba48e7a38e956afa527 (patch) | |
tree | 6760b9b27fea80ab62af85758bfd18c902fa4760 /board/freescale/mpc8544ds | |
parent | 50c03c8cf494d91cdec39670d95337c743e16ec9 (diff) | |
download | u-boot-f59b55a5b8fcadaa99781ba48e7a38e956afa527.tar.xz |
Stop using immap_t for guts offset on 85xx
In the future the offsets to various blocks may not be in same location.
Move to using CFG_MPC85xx_GUTS_ADDR as the base of the guts registers
instead of getting it via &immap->im_gur.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'board/freescale/mpc8544ds')
-rw-r--r-- | board/freescale/mpc8544ds/mpc8544ds.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index 6f9864a..e13be63 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -50,7 +50,7 @@ int board_early_init_f (void) int checkboard (void) { volatile immap_t *immap = (immap_t *) CFG_CCSRBAR; - volatile ccsr_gur_t *gur = &immap->im_gur; + volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); volatile ccsr_lbc_t *lbc = &immap->im_lbc; volatile ccsr_local_ecm_t *ecm = &immap->im_local_ecm; @@ -146,8 +146,7 @@ int first_free_busno=0; void pci_init_board(void) { - volatile immap_t *immap = (immap_t *)CFG_IMMR; - volatile ccsr_gur_t *gur = &immap->im_gur; + volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); uint devdisr = gur->devdisr; uint io_sel = (gur->pordevsr & MPC85xx_PORDEVSR_IO_SEL) >> 19; uint host_agent = (gur->porbmsr & MPC85xx_PORBMSR_HA) >> 16; |