diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-14 09:47:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-14 09:47:29 -0500 |
| commit | cffda7ddb84e4b1d99777f362410cedf058108f0 (patch) | |
| tree | cb4b1d895420f7ebe4a6a9684a0e25681a8224b5 /arch | |
| parent | 3ff1ff3ff76c15efe0451309af084ee6c096c583 (diff) | |
| parent | 70bae02f71d4d4f7bfadd4f68f0823a453bbd7e6 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Clearfog: Fix SD card booting (Baruch)
- Fix potential dereference NULL pointer in dram_init() (Chris)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/armada-388-clearfog-u-boot.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/dram.c | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi index cf6c08881b..38e4f3d99a 100644 --- a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi +++ b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi @@ -12,6 +12,10 @@ u-boot,dm-spl; }; +&gpio0 { + u-boot,dm-spl; +}; + &ahci0 { u-boot,dm-spl; }; diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c index fa8c799a46..ba8ebc6288 100644 --- a/arch/arm/mach-mvebu/dram.c +++ b/arch/arm/mach-mvebu/dram.c @@ -281,16 +281,6 @@ int dram_init(void) size = MVEBU_SDRAM_SIZE_MAX; } - for (; i < CONFIG_NR_DRAM_BANKS; i++) { - /* If above loop terminated prematurely, we need to set - * remaining banks' start address & size as 0. Otherwise other - * u-boot functions and Linux kernel gets wrong values which - * could result in crash */ - gd->bd->bi_dram[i].start = 0; - gd->bd->bi_dram[i].size = 0; - } - - if (ecc_enabled()) dram_ecc_scrubbing(); |