LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fdt: Fixup only valid memory banks 

Memory banks with address 0 and size 0 are empty and should not be
passed to the OS via device tree.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Thierry Reding 2018-01-30 11:34:17 +01:00 committed by Simon Glass
parent 4280342adb
commit 6d29cc7dcf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/fdt_support.c
View File

@ -418,7 +418,7 @@ static int fdt_pack_reg(const void *fdt, void *buf, u64 *address, u64 *size,
int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks)
{ {
int err, nodeoffset; int err, nodeoffset;
int len; int len, i;
u8 tmp[MEMORY_BANKS_MAX * 16]; /* Up to 64-bit address + 64-bit size */ u8 tmp[MEMORY_BANKS_MAX * 16]; /* Up to 64-bit address + 64-bit size */
if (banks > MEMORY_BANKS_MAX) { if (banks > MEMORY_BANKS_MAX) {
@ -450,6 +450,12 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks)
if (!banks) if (!banks)
return 0; return 0;
for (i = 0; i < banks; i++)
if (start[i] == 0 && size[i] == 0)
break;
banks = i;
len = fdt_pack_reg(blob, tmp, start, size, banks); len = fdt_pack_reg(blob, tmp, start, size, banks);
err = fdt_setprop(blob, nodeoffset, "reg", tmp, len); err = fdt_setprop(blob, nodeoffset, "reg", tmp, len);