Message ID | 20180215180559.27875-1-thierry.reding@gmail.com |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
Series | [U-Boot,v2] fdt: Fixup only valid memory banks | expand |
On Thu, Feb 15, 2018 at 07:05:59PM +0100, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > Memory banks with address 0 and size 0 are empty and should not be > passed to the OS via device tree. > > Acked-by: Stephen Warren <swarren@nvidia.com> > Signed-off-by: Thierry Reding <treding@nvidia.com> Applied to u-boot/master, thanks!
diff --git a/common/fdt_support.c b/common/fdt_support.c index 17623a1728f6..da0c12e9c1bc 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -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 err, nodeoffset; - int len; + int len, i; u8 tmp[MEMORY_BANKS_MAX * 16]; /* Up to 64-bit address + 64-bit size */ if (banks > MEMORY_BANKS_MAX) { @@ -447,6 +447,13 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) return err; } + for (i = 0; i < banks; i++) { + if (start[i] == 0 && size[i] == 0) + break; + } + + banks = i; + if (!banks) return 0;