]> git.sur5r.net Git - u-boot/blobdiff - cmd/bdinfo.c
projects / u-boot / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
powerpc, 8xx: remove support for 8xx
[u-boot] / cmd / bdinfo.c
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 5409105e4da21be7e9de0bd442eed63c0465589c..484a8532ed9b8eaea895cc40e95aa0f29d5a6af1 100644 (file)
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -98,9 +98,11 @@ static inline void print_bi_dram(const bd_t *bd)
        int i;
 
        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);
+               if (bd->bi_dram[i].size) {
+                       print_num("DRAM bank",  i);
+                       print_num("-> start",   bd->bi_dram[i].start);
+                       print_num("-> size",    bd->bi_dram[i].size);
+               }
        }
 #endif
 }
@@ -112,7 +114,7 @@ static inline void print_bi_flash(const bd_t *bd)
        print_num("flash size     ",    (ulong)bd->bi_flashsize);
        print_num("flash offset   ",    (ulong)bd->bi_flashoffset);
 
-#elif defined(CONFIG_NIOS2) || defined(CONFIG_OPENRISC)
+#elif defined(CONFIG_NIOS2)
        print_num("flash start",        (ulong)bd->bi_flashstart);
        print_num("flash size",         (ulong)bd->bi_flashsize);
        print_num("flash offset",       (ulong)bd->bi_flashoffset);
@@ -146,6 +148,24 @@ static inline void print_eth_ip_addr(void)
 #endif
 }
 
+static inline void print_baudrate(void)
+{
+#if defined(CONFIG_PPC)
+       printf("baudrate    = %6u bps\n", gd->baudrate);
+#else
+       printf("baudrate    = %u bps\n", gd->baudrate);
+#endif
+}
+
+static inline void __maybe_unused print_std_bdinfo(const bd_t *bd)
+{
+       print_bi_boot_params(bd);
+       print_bi_mem(bd);
+       print_bi_flash(bd);
+       print_eth_ip_addr();
+       print_baudrate();
+}
+
 #if defined(CONFIG_PPC)
 void __weak board_detail(void)
 {
@@ -163,7 +183,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_bi_flash(bd);
        print_num("sramstart",          bd->bi_sramstart);
        print_num("sramsize",           bd->bi_sramsize);
-#if    defined(CONFIG_5xx)  || defined(CONFIG_8xx) || \
+#if    defined(CONFIG_5xx)  || \
        defined(CONFIG_MPC8260) || defined(CONFIG_E500)
        print_num("immr_base",          bd->bi_immr_base);
 #endif
@@ -204,7 +224,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #endif
 
        print_eth_ip_addr();
-       printf("baudrate    = %6u bps\n", gd->baudrate);
+       print_baudrate();
        print_num("relocaddr", gd->relocaddr);
        board_detail();
        return 0;
@@ -225,7 +245,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #endif
 
        print_eth_ip_addr();
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_baudrate();
 
        return 0;
 }
@@ -245,7 +265,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #if defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)
        print_eths();
 #endif
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_baudrate();
        print_num("relocaddr", gd->relocaddr);
        print_num("reloc off", gd->reloc_off);
        print_num("fdt_blob", (ulong)gd->fdt_blob);
@@ -255,36 +275,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        return 0;
 }
 
-#elif defined(CONFIG_SPARC)
-
-int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
-{
-       bd_t *bd = gd->bd;
-
-#ifdef DEBUG
-       print_num("bd address             ", (ulong) bd);
-#endif
-       print_num("memstart               ", bd->bi_memstart);
-       print_lnum("memsize                ", bd->bi_memsize);
-       print_num("flashstart             ", bd->bi_flashstart);
-       print_num("CONFIG_SYS_MONITOR_BASE       ", CONFIG_SYS_MONITOR_BASE);
-       print_num("CONFIG_ENV_ADDR           ", CONFIG_ENV_ADDR);
-       printf("CONFIG_SYS_RELOC_MONITOR_BASE = 0x%x (%d)\n", CONFIG_SYS_RELOC_MONITOR_BASE,
-              CONFIG_SYS_MONITOR_LEN);
-       printf("CONFIG_SYS_MALLOC_BASE        = 0x%x (%d)\n", CONFIG_SYS_MALLOC_BASE,
-              CONFIG_SYS_MALLOC_LEN);
-       printf("CONFIG_SYS_INIT_SP_OFFSET     = 0x%x (%d)\n", CONFIG_SYS_INIT_SP_OFFSET,
-              CONFIG_SYS_STACK_SIZE);
-       printf("CONFIG_SYS_PROM_OFFSET        = 0x%x (%d)\n", CONFIG_SYS_PROM_OFFSET,
-              CONFIG_SYS_PROM_SIZE);
-       printf("CONFIG_SYS_GBL_DATA_OFFSET    = 0x%x (%d)\n", CONFIG_SYS_GBL_DATA_OFFSET,
-              GENERATED_GBL_DATA_SIZE);
-
-       print_eth_ip_addr();
-       printf("baudrate               = %6u bps\n", gd->baudrate);
-       return 0;
-}
-
 #elif defined(CONFIG_M68K)
 
 int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@@ -311,29 +301,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_mhz("vcofreq",            bd->bi_vcofreq);
 #endif
        print_eth_ip_addr();
-       printf("baudrate    = %u bps\n", gd->baudrate);
-
-       return 0;
-}
-
-#elif defined(CONFIG_BLACKFIN)
-
-int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       bd_t *bd = gd->bd;
-
-       printf("U-Boot      = %s\n", bd->bi_r_version);
-       printf("CPU         = %s\n", bd->bi_cpu);
-       printf("Board       = %s\n", bd->bi_board_name);
-       print_mhz("VCO",        bd->bi_vco);
-       print_mhz("CCLK",       bd->bi_cclk);
-       print_mhz("SCLK",       bd->bi_sclk);
-
-       print_bi_boot_params(bd);
-       print_bi_mem(bd);
-       print_bi_flash(bd);
-       print_eth_ip_addr();
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_baudrate();
 
        return 0;
 }
@@ -342,13 +310,7 @@ 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[])
 {
-       bd_t *bd = gd->bd;
-
-       print_bi_boot_params(bd);
-       print_bi_mem(bd);
-       print_bi_flash(bd);
-       print_eth_ip_addr();
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_std_bdinfo(gd->bd);
        print_num("relocaddr", gd->relocaddr);
        print_num("reloc off", gd->reloc_off);
 
@@ -359,14 +321,7 @@ 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[])
 {
-       bd_t *bd = gd->bd;
-
-       print_bi_boot_params(bd);
-       print_bi_mem(bd);
-       print_bi_flash(bd);
-       print_eth_ip_addr();
-       printf("baudrate    = %u bps\n", gd->baudrate);
-
+       print_std_bdinfo(gd->bd);
        return 0;
 }
 
@@ -387,10 +342,14 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc,
                          gd->arch.secure_ram & MEM_RESERVE_SECURE_ADDR_MASK);
        }
 #endif
+#ifdef CONFIG_RESV_RAM
+       if (gd->arch.resv_ram)
+               print_num("Reserved ram", gd->arch.resv_ram);
+#endif
 #if defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)
        print_eths();
 #endif
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_baudrate();
 #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
        print_num("TLB addr", gd->arch.tlb_addr);
 #endif
@@ -430,7 +389,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_bi_mem(bd);
        print_bi_flash(bd);
        print_eth_ip_addr();
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_baudrate();
        return 0;
 }
 
@@ -441,16 +400,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        bd_t *bd = gd->bd;
 
        print_bi_boot_params(bd);
-       print_num("bi_memstart",        bd->bi_memstart);
-       print_num("bi_memsize",         bd->bi_memsize);
-       print_num("bi_flashstart",      bd->bi_flashstart);
-       print_num("bi_flashsize",       bd->bi_flashsize);
-       print_num("bi_flashoffset",     bd->bi_flashoffset);
-       print_num("bi_sramstart",       bd->bi_sramstart);
-       print_num("bi_sramsize",        bd->bi_sramsize);
-       print_num("bi_bootflags",       bd->bi_bootflags);
-       print_mhz("cpufreq",            bd->bi_intfreq);
-       print_mhz("busfreq",            bd->bi_busfreq);
 
        print_bi_dram(bd);
 
@@ -458,7 +407,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_eth_ip_addr();
        print_mhz("ethspeed",       bd->bi_ethspeed);
 #endif
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_baudrate();
 
        return 0;
 }
@@ -489,35 +438,29 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_bi_boot_params(bd);
        print_bi_dram(bd);
        print_eth_ip_addr();
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_baudrate();
 
        return 0;
 }
 
-#elif defined(CONFIG_OPENRISC)
+#elif defined(CONFIG_ARC)
 
 int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        bd_t *bd = gd->bd;
 
        print_bi_mem(bd);
-       print_bi_flash(bd);
        print_eth_ip_addr();
-       printf("baudrate    = %u bps\n", gd->baudrate);
+       print_baudrate();
 
        return 0;
 }
 
-#elif defined(CONFIG_ARC)
+#elif defined(CONFIG_XTENSA)
 
 int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       bd_t *bd = gd->bd;
-
-       print_bi_mem(bd);
-       print_eth_ip_addr();
-       printf("baudrate    = %d bps\n", gd->baudrate);
-
+       print_std_bdinfo(gd->bd);
        return 0;
 }
 
Cloned from git://git.denx.de/u-boot.git