diff options
author | Wolfgang Denk <wd@denx.de> | 2009-04-01 22:43:51 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-04-01 22:43:51 +0200 |
commit | da72af8d727e74093e5fcb3e8599eb8d0df7a749 (patch) | |
tree | 8937781ff72c3841e2352863e3060f0b1a1808ed /board/freescale/mpc8541cds/mpc8541cds.c | |
parent | c2eb8be7f760a2efe30a495bfb10857838dcf3fa (diff) | |
parent | fc39c2fd51e64707de4d61ed49479ebea2847e1b (diff) | |
download | u-boot-imx-da72af8d727e74093e5fcb3e8599eb8d0df7a749.zip u-boot-imx-da72af8d727e74093e5fcb3e8599eb8d0df7a749.tar.gz u-boot-imx-da72af8d727e74093e5fcb3e8599eb8d0df7a749.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/freescale/mpc8541cds/mpc8541cds.c')
-rw-r--r-- | board/freescale/mpc8541cds/mpc8541cds.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c index e6025c8..c30d966 100644 --- a/board/freescale/mpc8541cds/mpc8541cds.c +++ b/board/freescale/mpc8541cds/mpc8541cds.c @@ -372,21 +372,21 @@ sdram_init(void) cpu_board_rev = get_cpu_board_revision(); lsdmr_common = CONFIG_SYS_LBC_LSDMR_COMMON; if (cpu_board_rev == MPC85XX_CPU_BOARD_REV_1_0) { - lsdmr_common |= CONFIG_SYS_LBC_LSDMR_BSMA1617; + lsdmr_common |= LSDMR_BSMA1617; } else if (cpu_board_rev == MPC85XX_CPU_BOARD_REV_1_1) { - lsdmr_common |= CONFIG_SYS_LBC_LSDMR_BSMA1516; + lsdmr_common |= LSDMR_BSMA1516; } else { /* * Assume something unable to identify itself is * really old, and likely has lines 16/17 mapped. */ - lsdmr_common |= CONFIG_SYS_LBC_LSDMR_BSMA1617; + lsdmr_common |= LSDMR_BSMA1617; } /* * Issue PRECHARGE ALL command. */ - lbc->lsdmr = lsdmr_common | CONFIG_SYS_LBC_LSDMR_OP_PCHALL; + lbc->lsdmr = lsdmr_common | LSDMR_OP_PCHALL; asm("sync;msync"); *sdram_addr = 0xff; ppcDcbf((unsigned long) sdram_addr); @@ -396,7 +396,7 @@ sdram_init(void) * Issue 8 AUTO REFRESH commands. */ for (idx = 0; idx < 8; idx++) { - lbc->lsdmr = lsdmr_common | CONFIG_SYS_LBC_LSDMR_OP_ARFRSH; + lbc->lsdmr = lsdmr_common | LSDMR_OP_ARFRSH; asm("sync;msync"); *sdram_addr = 0xff; ppcDcbf((unsigned long) sdram_addr); @@ -406,7 +406,7 @@ sdram_init(void) /* * Issue 8 MODE-set command. */ - lbc->lsdmr = lsdmr_common | CONFIG_SYS_LBC_LSDMR_OP_MRW; + lbc->lsdmr = lsdmr_common | LSDMR_OP_MRW; asm("sync;msync"); *sdram_addr = 0xff; ppcDcbf((unsigned long) sdram_addr); @@ -415,7 +415,7 @@ sdram_init(void) /* * Issue NORMAL OP command. */ - lbc->lsdmr = lsdmr_common | CONFIG_SYS_LBC_LSDMR_OP_NORMAL; + lbc->lsdmr = lsdmr_common | LSDMR_OP_NORMAL; asm("sync;msync"); *sdram_addr = 0xff; ppcDcbf((unsigned long) sdram_addr); |