From: Ramon Fried Date: Mon, 13 Aug 2018 21:35:42 +0000 (+0300) Subject: fdt_support: Use CONFIG_NR_DRAM_BANKS if necessary X-Git-Url: http://git.dujemihanovic.xyz/%22/img/sics.gif/%22/static/git-favicon.png?a=commitdiff_plain;h=6b6f216f9234c33881af05116057c902cb411a62;p=u-boot.git fdt_support: Use CONFIG_NR_DRAM_BANKS if necessary If CONFIG_NR_DRAM_BANKS is bigger than the default value (4) define MEMORY_BANKS_MAX as CONFIG_NR_DRAM_BANKS. Fixes: 2a1f4f1758b5 ("Revert "fdt_support: Use CONFIG_NR_DRAM_BANKS if defined"") Signed-off-by: Ramon Fried --- diff --git a/common/fdt_support.c b/common/fdt_support.c index 34d2bd59c4..d84f5dbade 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -409,7 +409,11 @@ static int fdt_pack_reg(const void *fdt, void *buf, u64 *address, u64 *size, return p - (char *)buf; } +#if CONFIG_NR_DRAM_BANKS > 4 +#define MEMORY_BANKS_MAX CONFIG_NR_DRAM_BANKS +#else #define MEMORY_BANKS_MAX 4 +#endif int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) { int err, nodeoffset;