From f850371997fb3688885a814902fed07d22f113ef Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 9 Sep 2018 16:30:11 +0200 Subject: [PATCH] fdt: fix get_next_memory_node() The get_next_memory_node() always sets mem to -1 , which is incorrect, because then every iteration of memory bank parsing will start from the first memory bank instead of the previous one. On systems with 1 memory bank defined in DT and CONFIG_NR_DRAM_BANKS=4 , like ie. r8a77965-salvator-x , this will result in U-Boot incorrectly reporting four identical memory banks with the same memory configuration. Fix this by setting mem to startoffset value, which restores the behavior before the fixed patch was applied. Signed-off-by: Marek Vasut Cc: Jens Wiklander Cc: Simon Glass Cc: Tom Rini Fixes: 452bc121027d ("fdt: fix fdtdec_setup_memory_banksize()") Tested-by: Michal Simek [on ZynqMP} --- lib/fdtdec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/fdtdec.c b/lib/fdtdec.c index a208589..b2ec12e 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1182,10 +1182,8 @@ int fdtdec_setup_mem_size_base(void) #if defined(CONFIG_NR_DRAM_BANKS) -static int get_next_memory_node(const void *blob, int startoffset) +static int get_next_memory_node(const void *blob, int mem) { - int mem = -1; - do { mem = fdt_node_offset_by_prop_value(gd->fdt_blob, mem, "device_type", "memory", 7);