summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-08-06 01:31:20 -0700
committerSimon Glass <sjg@chromium.org>2015-08-14 03:24:20 -0600
commit715f599f8a0f8a0e60ee483f55eb207ade34ad49 (patch)
tree9f19b5dbf46b406bc65ce11d63192879ede1cb25
parentbbc1b99e8b8a1b87c2d0d959a1fcd1990abe82dd (diff)
downloadblackbird-obmc-uboot-715f599f8a0f8a0e60ee483f55eb207ade34ad49.tar.gz
blackbird-obmc-uboot-715f599f8a0f8a0e60ee483f55eb207ade34ad49.zip
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>
-rw-r--r--common/board_f.c3
-rw-r--r--include/asm-generic/u-boot.h4
2 files changed, 4 insertions, 3 deletions
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;
OpenPOWER on IntegriCloud