diff options
author | Stefan Roese <sr@denx.de> | 2007-12-29 09:23:11 +0100 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-12-29 09:23:11 +0100 |
commit | feaa43f3a8f465cbf01ffa1b23b6b52431819a52 (patch) | |
tree | 3ee393d421c72a882d27b1de5978a2a9befce062 /board/lwmon5/sdram.h | |
parent | 8697e6a19b10f514511b6a9c86de88bd108c4f8d (diff) | |
parent | e174ac34adf5d5653df12bc3cf19c52063a71269 (diff) | |
download | talos-obmc-uboot-feaa43f3a8f465cbf01ffa1b23b6b52431819a52.tar.gz talos-obmc-uboot-feaa43f3a8f465cbf01ffa1b23b6b52431819a52.zip |
Merge branch 'for-1.3.2-ver2'
Conflicts:
cpu/ppc4xx/fdt.c
include/configs/kilauea.h
include/configs/sequoia.h
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/lwmon5/sdram.h')
-rw-r--r-- | board/lwmon5/sdram.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/lwmon5/sdram.h b/board/lwmon5/sdram.h index 7f847aa2ad..6a7bf01efb 100644 --- a/board/lwmon5/sdram.h +++ b/board/lwmon5/sdram.h @@ -395,8 +395,8 @@ #define DDR0_26_TRAS_MAX_ENCODE(n) ((((unsigned long)(n))&0xFFFF)<<16) #define DDR0_26_TRAS_MAX_DECODE(n) ((((unsigned long)(n))>>16)&0xFFFF) #define DDR0_26_TREF_MASK 0x00003FFF -#define DDR0_26_TREF_ENCODE(n) ((((unsigned long)(n))&0x3FF)<<0) -#define DDR0_26_TREF_DECODE(n) ((((unsigned long)(n))>>0)&0x3FF) +#define DDR0_26_TREF_ENCODE(n) ((((unsigned long)(n))&0x3FFF)<<0) +#define DDR0_26_TREF_DECODE(n) ((((unsigned long)(n))>>0)&0x3FFF) #define DDR0_27 0x1B #define DDR0_27_EMRS_DATA_MASK 0x3FFF0000 |