diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 18:52:51 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 18:52:51 (GMT) |
| commit | 304f936aeaab0c3cc9d5af438fd3498ac7682991 (patch) | |
| tree | 6b50ccc855dff4717749974630d258ba786811d0 /arch/arm/cpu/armv7/exynos/dmc_common.c | |
| parent | 019b57cc1d280c3768e2e8a7ff22e07a64c2f670 (diff) | |
| parent | 5287d595449512385e25f5afcb68a130bf08bae6 (diff) | |
| download | u-boot-304f936aeaab0c3cc9d5af438fd3498ac7682991.tar.xz | |
Merge remote-tracking branch 'u-boot-samsung/master'
Conflicts:
boards.cfg
Conflict was trivial between goni maintainer change and
lager_nor removal.
Diffstat (limited to 'arch/arm/cpu/armv7/exynos/dmc_common.c')
| -rw-r--r-- | arch/arm/cpu/armv7/exynos/dmc_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/exynos/dmc_common.c b/arch/arm/cpu/armv7/exynos/dmc_common.c index cca925e..9b6ee69 100644 --- a/arch/arm/cpu/armv7/exynos/dmc_common.c +++ b/arch/arm/cpu/armv7/exynos/dmc_common.c @@ -162,7 +162,7 @@ void mem_ctrl_init(int reset) /* If there are any other memory variant, add their init call below */ if (param->mem_type == DDR_MODE_DDR3) { - ret = ddr3_mem_ctrl_init(mem, param->mem_iv_size, reset); + ret = ddr3_mem_ctrl_init(mem, reset); if (ret) { /* will hang if failed to init memory control */ while (1) |