diff options
author | Wolfgang Denk <wd@denx.de> | 2010-07-16 23:15:01 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-07-16 23:15:01 +0200 |
commit | b6c208ab1ebc2ac01e0029b8456210617ff67156 (patch) | |
tree | 65c1252178febcb70a5fc75e67748ceec8fe96e5 /board/mpc8540eval | |
parent | 16909f34b76e89871c0da528d6fe2ebf4e32231e (diff) | |
parent | 9f43d7997e9c5395eed4eddd32cd75942896a412 (diff) | |
download | u-boot-imx-b6c208ab1ebc2ac01e0029b8456210617ff67156.zip u-boot-imx-b6c208ab1ebc2ac01e0029b8456210617ff67156.tar.gz u-boot-imx-b6c208ab1ebc2ac01e0029b8456210617ff67156.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/mpc8540eval')
-rw-r--r-- | board/mpc8540eval/mpc8540eval.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/mpc8540eval/mpc8540eval.c b/board/mpc8540eval/mpc8540eval.c index 7c27233..054d644 100644 --- a/board/mpc8540eval/mpc8540eval.c +++ b/board/mpc8540eval/mpc8540eval.c @@ -69,7 +69,7 @@ phys_size_t initdram (int board_type) long dram_size = 0; #if !defined(CONFIG_RAM_AS_FLASH) - volatile ccsr_lbc_t *lbc = (void *)(CONFIG_SYS_MPC85xx_LBC_ADDR); + volatile fsl_lbc_t *lbc = LBC_BASE_ADDR; sys_info_t sysinfo; uint temp_lbcdll = 0; #endif @@ -110,8 +110,8 @@ phys_size_t initdram (int board_type) gur->lbcdllcr = ((temp_lbcdll & 0xff) << 16 ) | 0x80000000; asm("sync;isync;msync"); } - lbc->or2 = CONFIG_SYS_OR2_PRELIM; /* 64MB SDRAM */ - lbc->br2 = CONFIG_SYS_BR2_PRELIM; + set_lbc_or(2, CONFIG_SYS_OR2_PRELIM); /* 64MB SDRAM */ + set_lbc_br(2, CONFIG_SYS_BR2_PRELIM); lbc->lbcr = CONFIG_SYS_LBC_LBCR; lbc->lsdmr = CONFIG_SYS_LBC_LSDMR_1; asm("sync"); |