summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-11-06 09:21:33 -0500
committerTom Rini <trini@konsulko.com>2015-11-06 09:21:33 -0500
commit4ca0c3c993436cca743ed521e7f3d784d7fe31c8 (patch)
tree4a14903a7134569b12206d439603d9db04647af7 /common
parent250ea267d875ce3ff0e046308d31f51ff8d3b5e8 (diff)
parent75199d6f722a0f711628194240ee5bf724e31101 (diff)
downloadu-boot-imx-4ca0c3c993436cca743ed521e7f3d784d7fe31c8.zip
u-boot-imx-4ca0c3c993436cca743ed521e7f3d784d7fe31c8.tar.gz
u-boot-imx-4ca0c3c993436cca743ed521e7f3d784d7fe31c8.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-nios
Diffstat (limited to 'common')
-rw-r--r--common/board_f.c4
-rw-r--r--common/cmd_bdinfo.c9
2 files changed, 9 insertions, 4 deletions
diff --git a/common/board_f.c b/common/board_f.c
index a12ac28..725eb18 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -896,7 +896,7 @@ static init_fnc_t init_sequence_f[] = {
* - board info struct
*/
setup_dest_addr,
-#if defined(CONFIG_BLACKFIN) || defined(CONFIG_NIOS2)
+#if defined(CONFIG_BLACKFIN)
/* Blackfin u-boot monitor should be on top of the ram */
reserve_uboot,
#endif
@@ -921,7 +921,7 @@ static init_fnc_t init_sequence_f[] = {
!defined(CONFIG_BLACKFIN) && !defined(CONFIG_M68K)
reserve_video,
#endif
-#if !defined(CONFIG_BLACKFIN) && !defined(CONFIG_NIOS2)
+#if !defined(CONFIG_BLACKFIN)
reserve_uboot,
#endif
#ifndef CONFIG_SPL_BUILD
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index ed3b935..adda55a 100644
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -157,10 +157,15 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
+ int i;
bd_t *bd = gd->bd;
- print_num("mem start", (ulong)bd->bi_memstart);
- print_lnum("mem size", (u64)bd->bi_memsize);
+ for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) {
+ print_num("DRAM bank", i);
+ print_num("-> start", bd->bi_dram[i].start);
+ print_num("-> size", bd->bi_dram[i].size);
+ }
+
print_num("flash start", (ulong)bd->bi_flashstart);
print_num("flash size", (ulong)bd->bi_flashsize);
print_num("flash offset", (ulong)bd->bi_flashoffset);