diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2012-12-10 13:44:41 +0900 | 
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2012-12-10 14:13:27 +0900 | 
| commit | 2c601c7208713ba9b2158c57adcf515f4bdbc212 (patch) | |
| tree | 9f6e70f33565beceb956b98c261bee19731d50d2 /board/freescale/corenet_ds/ddr.c | |
| parent | b8a7c467960ffb4d5a5e1eef5f7783fb6f594542 (diff) | |
| parent | fd4d564b3c80b111f18c93adb14233a6a7ddb0e9 (diff) | |
| download | olio-uboot-2014.01-2c601c7208713ba9b2158c57adcf515f4bdbc212.tar.xz olio-uboot-2014.01-2c601c7208713ba9b2158c57adcf515f4bdbc212.zip | |
Merge branch 'master' of git://git.denx.de/u-boot into resolve
Conflicts:
	README
	board/samsung/universal_c210/universal.c
	drivers/misc/Makefile
	drivers/power/power_fsl.c
	include/configs/mx35pdk.h
	include/configs/mx53loco.h
	include/configs/seaboard.h
Diffstat (limited to 'board/freescale/corenet_ds/ddr.c')
| -rw-r--r-- | board/freescale/corenet_ds/ddr.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c index 4a53b8d93..da284cde9 100644 --- a/board/freescale/corenet_ds/ddr.c +++ b/board/freescale/corenet_ds/ddr.c @@ -139,8 +139,8 @@ static const struct board_specific_parameters udimm0[] = {  	{2,  1250,    4,     6,   0xff,    2,  0},  	{2,  1350,    5,     7,   0xff,    2,  0},  	{2,  1666,    5,     8,   0xff,    2,  0}, -	{1,   850,    4,     5,   0xff,    2,  0}, -	{1,   950,    4,     7,   0xff,    2,  0}, +	{1,  1250,    4,     6,   0xff,    2,  0}, +	{1,  1335,    4,     7,   0xff,    2,  0},  	{1,  1666,    4,     8,   0xff,    2,  0},  	{}  }; |