Merge branch 'master' of git://www.denx.de/git/u-boot-sunxi

[u-boot] / arch / arm / mach-uniphier / memconf / memconf-pxs2.c

diff --git a/arch/arm/mach-uniphier/memconf/memconf-pxs2.c b/arch/arm/mach-uniphier/memconf/memconf-pxs2.c
index bf14d0d283fa58f7f4dbb9db14619c8417f7de3d..e98eb48e04e5cc2d4ecbf855c2adff74da6570ae 100644 (file)
--- a/arch/arm/mach-uniphier/memconf/memconf-pxs2.c
+++ b/arch/arm/mach-uniphier/memconf/memconf-pxs2.c
@@ -49,6 +49,9 @@ int uniphier_pxs2_memconf_init(const struct uniphier_board_data *bd)
        case SZ_512M:
                tmp |= SG_MEMCONF_CH2_SZ_512M;
                break;
+       case SZ_1G:
+               tmp |= SG_MEMCONF_CH2_SZ_1G;
+               break;
        default:
                pr_err("error: unsupported DRAM Ch2 size\n");
                return -EINVAL;