diff options
author | Wolfgang Denk <wd@denx.de> | 2008-04-08 00:16:36 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-04-08 00:16:36 +0200 |
commit | a1b215e2a2a013327693f2fb990957b746f26cf5 (patch) | |
tree | c998a43b8022f623ac86a0de246d05ed36a86e9e /board/m501sk | |
parent | f9eabcb357ea294e3e01bfe26841bf51d6bd8f05 (diff) | |
parent | b5873f1732b92a25690e1513b90dfb0d644f6697 (diff) | |
download | u-boot-imx-a1b215e2a2a013327693f2fb990957b746f26cf5.zip u-boot-imx-a1b215e2a2a013327693f2fb990957b746f26cf5.tar.gz u-boot-imx-a1b215e2a2a013327693f2fb990957b746f26cf5.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-at91
Diffstat (limited to 'board/m501sk')
-rw-r--r-- | board/m501sk/memsetup.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/m501sk/memsetup.S b/board/m501sk/memsetup.S index 9e174b5..6aea723 100644 --- a/board/m501sk/memsetup.S +++ b/board/m501sk/memsetup.S @@ -52,8 +52,8 @@ #define MC_AASR_VAL 0x00000000 #define EBI_CFGR 0xFFFFFF64 #define EBI_CFGR_VAL 0x00000000 -#define SMC2_CSR 0xFFFFFF70 -#define SMC2_CSR_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */ +#define SMC_CSR0 0xFFFFFF70 +#define SMC_CSR0_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */ /* clocks */ #define PLLAR 0xFFFFFC28 @@ -141,8 +141,8 @@ SMRDATA: .word MC_AASR_VAL .word EBI_CFGR .word EBI_CFGR_VAL - .word SMC2_CSR - .word SMC2_CSR_VAL + .word SMC_CSR0 + .word SMC_CSR0_VAL .word PLLAR .word PLLAR_VAL .word PLLBR |