Skip to contentSkip to conversation

Revert "fdt_support: Use CONFIG_NR_DRAM_BANKS if defined"

PATCH In review Ramon Fried 3 participants 3 messages Jul 22, 2018 – Jul 30, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "fdt_support: Use CONFIG_NR_DRAM_BANKS if defined"

This reverts commit 5e5745465c94605720295fab942eacbdd215db90.

The reverted commit didn't support the scenario where there are less DRAM banks in U-Boot than in Linux.
Also, it didn't introduce any new functionality, only limitaion. User could just increase MEMORY_BANKS_MAX if it's too small.

---
 common/fdt_support.c | 4 ----
 1 file changed, 4 deletions(-)
common/fdt_support.c +0 -4
index 812eca8173..26f50a94ee 100644
@@ -409,11 +409,7 @@ static int fdt_pack_reg(const void *fdt, void *buf, u64 *address, u64 *size,
 	return p - (char *)buf;
 }
 
-#ifdef CONFIG_NR_DRAM_BANKS
-#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;
Signature · 1 line
2.18.0
#1 lore raw

PATCH 1/1 Revert "fdt_support: Use CONFIG_NR_DRAM_BANKS if defined"

Quoted 9 lines · Ramon Fried

This reverts commit 5e5745465c94605720295fab942eacbdd215db90.

The reverted commit didn't support the scenario where there are less DRAM banks in U-Boot than in Linux.
Also, it didn't introduce any new functionality, only limitaion. User could just increase MEMORY_BANKS_MAX if it's too small.

---
 common/fdt_support.c | 4 ----
 1 file changed, 4 deletions(-)
#2 lore raw
In reply to Ramon Fried
Quoted 7 lines · Ramon Fried

This reverts commit 5e5745465c94605720295fab942eacbdd215db90.

The reverted commit didn't support the scenario where there are less DRAM banks in U-Boot than in Linux.
Also, it didn't introduce any new functionality, only limitaion. User could just increase MEMORY_BANKS_MAX if it's too small.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180730/62ef45a9/attachment.sig>