From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ramon Fried Date: Sun, 12 Aug 2018 23:37:49 +0300 Subject: [U-Boot] [PATCH] fdt_support: Use VLA instead of MEMORY_BANKS_MAX Message-ID: <20180812203749.24241-1-ramon.fried@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: Ramon Fried Instead of relaying on user to configure MEMORY_BANKS_MAX correctly, use VLA (variable length array) to accommodate the required banks. Fixes: 2a1f4f1758b5 ("Revert "fdt_support: Use CONFIG_NR_DRAM_BANKS if defined"") Signed-off-by: Ramon Fried --- common/fdt_support.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 34d2bd5..e898236 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -409,19 +409,14 @@ static int fdt_pack_reg(const void *fdt, void *buf, u64 *address, u64 *size, return p - (char *)buf; } -#define MEMORY_BANKS_MAX 4 int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) { int err, nodeoffset; int len, i; - u8 tmp[MEMORY_BANKS_MAX * 16]; /* Up to 64-bit address + 64-bit size */ + u8 tmp[banks * 16]; /* Up to 64-bit address + 64-bit size */ - if (banks > MEMORY_BANKS_MAX) { - printf("%s: num banks %d exceeds hardcoded limit %d." - " Recompile with higher MEMORY_BANKS_MAX?\n", - __FUNCTION__, banks, MEMORY_BANKS_MAX); + if (!banks) return -1; - } err = fdt_check_header(blob); if (err < 0) { -- 2.7.4