diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-12-27 00:35:03 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-12-27 00:35:03 +0100 |
| commit | 3f523edb146c3dfbc52e7631b37e6f326e0e980d (patch) | |
| tree | 8889ebbfef58c0fcddb8c0d168482df93e2f8af9 /board/stxgp3/stxgp3.c | |
| parent | bd878eb024bf9cb351c9ce66db63558de2d0e395 (diff) | |
| parent | 8ff3de61fc5f9b3b21647bce081a3b7f710f0d4d (diff) | |
| download | u-boot-imx-3f523edb146c3dfbc52e7631b37e6f326e0e980d.zip u-boot-imx-3f523edb146c3dfbc52e7631b37e6f326e0e980d.tar.gz u-boot-imx-3f523edb146c3dfbc52e7631b37e6f326e0e980d.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Diffstat (limited to 'board/stxgp3/stxgp3.c')
| -rw-r--r-- | board/stxgp3/stxgp3.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/board/stxgp3/stxgp3.c b/board/stxgp3/stxgp3.c index a58c043..3649acf 100644 --- a/board/stxgp3/stxgp3.c +++ b/board/stxgp3/stxgp3.c @@ -203,8 +203,7 @@ int board_early_init_f(void) { #if defined(CONFIG_PCI) - volatile immap_t *immr = (immap_t *)CFG_IMMR; - volatile ccsr_pcix_t *pci = &immr->im_pcix; + volatile ccsr_pcix_t *pci = (void *)(CFG_MPC85xx_PCIX_ADDR); pci->peer &= 0xfffffffdf; /* disable master abort */ #endif @@ -283,11 +282,10 @@ initdram (int board_type) { long dram_size = 0; extern long spd_sdram (void); - volatile immap_t *immap = (immap_t *)CFG_IMMR; #if defined(CONFIG_DDR_DLL) { - volatile ccsr_gur_t *gur= &immap->im_gur; + volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); uint temp_ddrdll = 0; /* Work around to stabilize DDR DLL */ |