diff options
| author | Tom Rini <trini@konsulko.com> | 2018-10-25 10:16:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-25 10:16:21 -0400 |
| commit | cf033e04da315ba949e804c127abae0134bda30f (patch) | |
| tree | 77100d0a1c7ac1ce879509df57b845184f058550 /arch/arm/mach-imx/mx7/ddr.c | |
| parent | 1ed3c0954bd160dafcad8847a51c3ddd5f992f51 (diff) | |
| parent | 3c28576bb0f0990d699fd330089412e620706941 (diff) | |
Merge tag 'u-boot-imx-20181025' of git://git.denx.de/u-boot-imx
Merged imx8 architecture, fix build for imx8 + warnings
Diffstat (limited to 'arch/arm/mach-imx/mx7/ddr.c')
| -rw-r--r-- | arch/arm/mach-imx/mx7/ddr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mx7/ddr.c b/arch/arm/mach-imx/mx7/ddr.c index f19aeb80427..9713835bf27 100644 --- a/arch/arm/mach-imx/mx7/ddr.c +++ b/arch/arm/mach-imx/mx7/ddr.c @@ -196,5 +196,9 @@ unsigned int imx_ddr_size(void) if (field_val <= 29) bits++; + /* cap to max 2 GB */ + if (bits > 31) + bits = 31; + return 1 << bits; } |