summaryrefslogtreecommitdiff
path: root/board/stxssa
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-12-27 00:35:03 +0100
committerWolfgang Denk <wd@denx.de>2007-12-27 00:35:03 +0100
commit3f523edb146c3dfbc52e7631b37e6f326e0e980d (patch)
tree8889ebbfef58c0fcddb8c0d168482df93e2f8af9 /board/stxssa
parentbd878eb024bf9cb351c9ce66db63558de2d0e395 (diff)
parent8ff3de61fc5f9b3b21647bce081a3b7f710f0d4d (diff)
downloadu-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/stxssa')
-rw-r--r--board/stxssa/stxssa.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c
index 9bacb98..e2b38a6 100644
--- a/board/stxssa/stxssa.c
+++ b/board/stxssa/stxssa.c
@@ -252,8 +252,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 &= 0xffffffdf; /* disable master abort */
#endif
@@ -302,8 +301,7 @@ initdram (int board_type)
#if defined(CONFIG_DDR_DLL)
{
- 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 temp_ddrdll = 0;
/* Work around to stabilize DDR DLL */