summaryrefslogtreecommitdiffstats
path: root/board/cds/mpc8541cds/mpc8541cds.c
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-11-27 23:25:02 -0600
committerKumar Gala <galak@kernel.crashing.org>2007-12-11 22:34:19 -0600
commitf59b55a5b8fcadaa99781ba48e7a38e956afa527 (patch)
tree6760b9b27fea80ab62af85758bfd18c902fa4760 /board/cds/mpc8541cds/mpc8541cds.c
parent50c03c8cf494d91cdec39670d95337c743e16ec9 (diff)
downloadbootable_bootloader_goldelico_gta04-f59b55a5b8fcadaa99781ba48e7a38e956afa527.zip
bootable_bootloader_goldelico_gta04-f59b55a5b8fcadaa99781ba48e7a38e956afa527.tar.gz
bootable_bootloader_goldelico_gta04-f59b55a5b8fcadaa99781ba48e7a38e956afa527.tar.bz2
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/cds/mpc8541cds/mpc8541cds.c')
-rw-r--r--board/cds/mpc8541cds/mpc8541cds.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/board/cds/mpc8541cds/mpc8541cds.c b/board/cds/mpc8541cds/mpc8541cds.c
index 558ba99..36b2fa1 100644
--- a/board/cds/mpc8541cds/mpc8541cds.c
+++ b/board/cds/mpc8541cds/mpc8541cds.c
@@ -203,8 +203,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);
/* PCI slot in USER bits CSR[6:7] by convention. */
uint pci_slot = get_pci_slot ();
@@ -250,7 +249,6 @@ long int
initdram(int board_type)
{
long dram_size = 0;
- volatile immap_t *immap = (immap_t *)CFG_IMMR;
puts("Initializing\n");
@@ -263,7 +261,7 @@ initdram(int board_type)
* Override DLL = 1, Course Adj = 1, Tap Select = 0
*/
- volatile ccsr_gur_t *gur= &immap->im_gur;
+ volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR);
gur->ddrdllcr = 0x81000000;
asm("sync;isync;msync");
@@ -294,7 +292,7 @@ void
local_bus_init(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);
volatile ccsr_lbc_t *lbc = &immap->im_lbc;
uint clkdiv;