From: Bin Meng <bmeng.cn@gmail.com>
Date: Thu, 6 Aug 2015 08:31:20 +0000 (-0700)
Subject: common: Display >=4GiB memory bank size
X-Git-Tag: v2015.10-rc2~10^2~28
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;ds=sidebyside;h=715f599f8a0f8a0e60ee483f55eb207ade34ad49;p=oweals%2Fu-boot.git

common: Display >=4GiB memory bank size

bd->bi_dram[] has both start address and size defined as 32-bit,
which is not the case on some platforms where >=4GiB memory bank
is used. Change them to support such memory banks.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/common/board_f.c b/common/board_f.c
index c7cc67c7a4..8cca4def2c 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -206,7 +206,8 @@ static int show_dram_config(void)
 	debug("\nRAM Configuration:\n");
 	for (i = size = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
 		size += gd->bd->bi_dram[i].size;
-		debug("Bank #%d: %08lx ", i, gd->bd->bi_dram[i].start);
+		debug("Bank #%d: %llx ", i,
+		      (unsigned long long)(gd->bd->bi_dram[i].start));
 #ifdef DEBUG
 		print_size(gd->bd->bi_dram[i].size, "\n");
 #endif
diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h
index c918049386..9f3351d602 100644
--- a/include/asm-generic/u-boot.h
+++ b/include/asm-generic/u-boot.h
@@ -130,8 +130,8 @@ typedef struct bd_info {
 	ulong	        bi_boot_params;	/* where this board expects params */
 #ifdef CONFIG_NR_DRAM_BANKS
 	struct {			/* RAM configuration */
-		ulong start;
-		ulong size;
+		phys_addr_t start;
+		phys_size_t size;
 	} bi_dram[CONFIG_NR_DRAM_BANKS];
 #endif /* CONFIG_NR_DRAM_BANKS */
 } bd_t;