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/pm856 | |
| 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/pm856')
| -rw-r--r-- | board/pm856/pm856.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/board/pm856/pm856.c b/board/pm856/pm856.c index a100754..bfde695 100644 --- a/board/pm856/pm856.c +++ b/board/pm856/pm856.c @@ -232,13 +232,12 @@ initdram(int board_type) { long dram_size = 0; extern long spd_sdram (void); - volatile immap_t *immap = (immap_t *)CFG_IMMR; puts("Initializing\n"); #if defined(CONFIG_DDR_DLL) { - volatile ccsr_gur_t *gur= &immap->im_gur; + volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); int i,x; x = 10; @@ -287,9 +286,8 @@ initdram(int board_type) void local_bus_init(void) { - volatile immap_t *immap = (immap_t *)CFG_IMMR; - volatile ccsr_gur_t *gur = &immap->im_gur; - volatile ccsr_lbc_t *lbc = &immap->im_lbc; + volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); + volatile ccsr_lbc_t *lbc = (void *)(CFG_MPC85xx_LBC_ADDR); uint clkdiv; uint lbc_hz; @@ -382,8 +380,7 @@ int testdram (void) long int fixed_sdram (void) { #ifndef CFG_RAMBOOT - volatile immap_t *immap = (immap_t *)CFG_IMMR; - volatile ccsr_ddr_t *ddr= &immap->im_ddr; + volatile ccsr_ddr_t *ddr= (void *)(CFG_MPC85xx_DDR_ADDR); ddr->cs0_bnds = CFG_DDR_CS0_BNDS; ddr->cs0_config = CFG_DDR_CS0_CONFIG; |