Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-16 17:58:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell

Browse source 
- Clearfog: Fix SD card booting (Baruch)
- Fix potential dereference NULL pointer in dram_init() (Chris)
This commit is contained in:
Tom Rini 2019-11-14 09:47:29 -05:00
commit cffda7ddb8
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/dts/armada-388-clearfog-u-boot.dtsi
View file

@ -12,6 +12,10 @@
u-boot,dm-spl;
};
&gpio0 {
u-boot,dm-spl;
};
&ahci0 {
u-boot,dm-spl;
};

10
arch/arm/mach-mvebu/dram.c
View file

@ -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();