diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-31 13:26:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-31 13:26:28 -0500 |
| commit | 80e99adbe47d1c8590f9b971ac52257fdc51a5ec (patch) | |
| tree | 2da762e5bd632c832852fd3d3c18d8b7cdef9e38 /arch/arm/mach-uniphier/dram_init.c | |
| parent | 514d00e527320a96c682029f4982955700f1664b (diff) | |
| parent | 76cd7d47fb8ac191553b741bb424e93c94ca759a (diff) | |
Merge tag 'uniphier-v2020.04-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier
UniPhier SoC updates for v2020.04 (2nd)
Denali NAND driver changes:
- Set up more registers in denali-spl for SOCFPGA
- Make clocks optional
- Do not assert reset signals in the remove hook
- associate SPARE_AREA_SKIP_BYTES with DT compatible
- switch to UCLASS_MTD
UniPhier platform changes:
- fix a bug in dram_init()
- specify loadaddr for "source" command
Diffstat (limited to 'arch/arm/mach-uniphier/dram_init.c')
| -rw-r--r-- | arch/arm/mach-uniphier/dram_init.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c index 13821a9288..5f9d90fe6d 100644 --- a/arch/arm/mach-uniphier/dram_init.c +++ b/arch/arm/mach-uniphier/dram_init.c @@ -248,12 +248,7 @@ int dram_init(void) max_size = (1ULL << 32) - dram_map[i].base; - if (dram_map[i].size > max_size) { - gd->ram_size += max_size; - break; - } - - gd->ram_size += dram_map[i].size; + gd->ram_size = min(dram_map[i].size, max_size); if (!valid_bank_found) gd->ram_base = dram_map[i].base; |