From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Date: Tue, 30 Jan 2018 11:34:17 +0100 Subject: [U-Boot] [PATCH] fdt: Fixup only valid memory banks Message-ID: <20180130103417.4815-1-thierry.reding@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Thierry Reding 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 --- common/fdt_support.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 724452d75452..8b33f6773d27 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -457,7 +457,7 @@ int fdt_record_loadable(void *blob, u32 index, const char *name, 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) { @@ -489,6 +489,12 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) if (!banks) 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); err = fdt_setprop(blob, nodeoffset, "reg", tmp, len); -- 2.15.1