Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagn...@jcrosoft.com>
---
common/cmd_bdinfo.c | 6 ++++-
lib_arm/bdinfo.c | 10 ++++----
lib_avr32/bdinfo.c | 16 +++++++-------
lib_i386/bdinfo.c | 16 +++++++-------
lib_m68k/bdinfo.c | 32 ++++++++++++++--------------
lib_microblaze/bdinfo.c | 18 +++++++-------
lib_mips/bdinfo.c | 16 +++++++-------
lib_nios/bdinfo.c | 14 ++++++------
lib_nios2/bdinfo.c | 18 +++++++-------
lib_ppc/bdinfo.c | 54 +++++++++++++++++++++++-----------------------
lib_sh/bdinfo.c | 16 +++++++-------
11 files changed, 110 insertions(+), 106 deletions(-)
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index 2d83b93..db25330 100644
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -60,14 +60,18 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
void print_eth(int idx)
{
- char name[10], *val;
+ char name[10];
+ char *val;
+
if (idx)
sprintf(name, "eth%iaddr", idx);
else
strcpy(name, "ethaddr");
+
val = getenv(name);
if (!val)
val = "(not set)";
+
printf("%-12s= %s\n", name, val);
}
diff --git a/lib_arm/bdinfo.c b/lib_arm/bdinfo.c
index 0e5084b..d5b5a4b 100644
--- a/lib_arm/bdinfo.c
+++ b/lib_arm/bdinfo.c
@@ -35,9 +35,9 @@ void arch_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
int i;
bd_t *bd = gd->bd;
- print_num ("arch_number", bd->bi_arch_number);
- print_num ("env_t", (ulong)bd->bi_env);
- print_num ("boot_params", (ulong)bd->bi_boot_params);
+ print_num("arch_number", bd->bi_arch_number);
+ print_num("env_t", (ulong)bd->bi_env);
+ print_num("boot_params", (ulong)bd->bi_boot_params);
for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) {
print_num("DRAM bank", i);
@@ -47,7 +47,7 @@ void arch_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
#if defined(CONFIG_CMD_NET)
print_eth(0);
- printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
+ printf("ip_addr = %pI4\n", &bd->bi_ip_addr);
#endif
- printf ("baudrate = %d bps\n", bd->bi_baudrate);
+ printf("baudrate = %d bps\n", bd->bi_baudrate);
}
diff --git a/lib_avr32/bdinfo.c b/lib_avr32/bdinfo.c
index 616481d..a040c7a 100644
--- a/lib_avr32/bdinfo.c
+++ b/lib_avr32/bdinfo.c
@@ -34,14 +34,14 @@ void arch_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
{
bd_t *bd = gd->bd;
- print_num ("boot_params", (ulong)bd->bi_boot_params);
- print_num ("memstart", (ulong)bd->bi_memstart);
- print_lnum ("memsize", (u64)bd->bi_memsize);
- print_num ("flashstart", (ulong)bd->bi_flashstart);
- print_num ("flashsize", (ulong)bd->bi_flashsize);
- print_num ("flashoffset", (ulong)bd->bi_flashoffset);
+ print_num("boot_params", (ulong)bd->bi_boot_params);
+ print_num("memstart", (ulong)bd->bi_memstart);
+ print_lnum("memsize", (u64)bd->bi_memsize);
+ print_num("flashstart", (ulong)bd->bi_flashstart);
+ print_num("flashsize", (ulong)bd->bi_flashsize);
+ print_num("flashoffset", (ulong)bd->bi_flashoffset);
print_eth(0);
- printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
- printf ("baudrate = %d bps\n", bd->bi_baudrate);
+ printf("ip_addr = %pI4\n", &bd->bi_ip_addr);
+ printf("baudrate = %d bps\n", bd->bi_baudrate);
}
diff --git a/lib_i386/bdinfo.c b/lib_i386/bdinfo.c
index 616481d..a040c7a 100644
--- a/lib_i386/bdinfo.c
+++ b/lib_i386/bdinfo.c
@@ -34,14 +34,14 @@ void arch_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
{
bd_t *bd = gd->bd;
- print_num ("boot_params", (ulong)bd->bi_boot_params);
- print_num ("memstart", (ulong)bd->bi_memstart);
- print_lnum ("memsize", (u64)bd->bi_memsize);
- print_num ("flashstart", (ulong)bd->bi_flashstart);
- print_num ("flashsize", (ulong)bd->bi_flashsize);
- print_num ("flashoffset", (ulong)bd->bi_flashoffset);
+ print_num("boot_params", (ulong)bd->bi_boot_params);
+ print_num("memstart", (ulong)bd->bi_memstart);
+ print_lnum("memsize", (u64)bd->bi_memsize);
+ print_num("flashstart", (ulong)bd->bi_flashstart);
+ print_num("flashsize", (ulong)bd->bi_flashsize);
+ print_num("flashoffset", (ulong)bd->bi_flashoffset);
print_eth(0);
- printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
- printf ("baudrate = %d bps\n", bd->bi_baudrate);
+ printf("ip_addr = %pI4\n", &bd->bi_ip_addr);
+ printf("baudrate = %d bps\n", bd->bi_baudrate);
}
diff --git a/lib_m68k/bdinfo.c b/lib_m68k/bdinfo.c
index e77a1cf..e271145 100644
--- a/lib_m68k/bdinfo.c
+++ b/lib_m68k/bdinfo.c
@@ -35,27 +35,27 @@ void arch_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
bd_t *bd = gd->bd;
char buf[32];
- print_num ("memstart", (ulong)bd->bi_memstart);
- print_lnum ("memsize", (u64)bd->bi_memsize);
- print_num ("flashstart", (ulong)bd->bi_flashstart);
- print_num ("flashsize", (ulong)bd->bi_flashsize);
- print_num ("flashoffset", (ulong)bd->bi_flashoffset);
+ print_num("memstart", (ulong)bd->bi_memstart);
+ print_lnum("memsize", (u64)bd->bi_memsize);
+ print_num("flashstart", (ulong)bd->bi_flashstart);
+ print_num("flashsize", (ulong)bd->bi_flashsize);
+ print_num("flashoffset", (ulong)bd->bi_flashoffset);
#if defined(CONFIG_SYS_INIT_RAM_ADDR)
- print_num ("sramstart", (ulong)bd->bi_sramstart);
- print_num ("sramsize", (ulong)bd->bi_sramsize);
+ print_num("sramstart", (ulong)bd->bi_sramstart);
+ print_num("sramsize", (ulong)bd->bi_sramsize);
#endif
#if defined(CONFIG_SYS_MBAR)
- print_num ("mbar", bd->bi_mbar_base);
+ print_num("mbar", bd->bi_mbar_base);
#endif
- print_str ("cpufreq", strmhz(buf, bd->bi_intfreq));
- print_str ("busfreq", strmhz(buf, bd->bi_busfreq));
+ print_str("cpufreq", strmhz(buf, bd->bi_intfreq));
+ print_str("busfreq", strmhz(buf, bd->bi_busfreq));
#ifdef CONFIG_PCI
- print_str ("pcifreq", strmhz(buf, bd->bi_pcifreq));
+ print_str("pcifreq", strmhz(buf, bd->bi_pcifreq));
#endif
#ifdef CONFIG_EXTRA_CLOCK
- print_str ("flbfreq", strmhz(buf, bd->bi_flbfreq));
- print_str ("inpfreq", strmhz(buf, bd->bi_inpfreq));
- print_str ("vcofreq", strmhz(buf, bd->bi_vcofreq));
+ print_str("flbfreq", strmhz(buf, bd->bi_flbfreq));
+ print_str("inpfreq", strmhz(buf, bd->bi_inpfreq));
+ print_str("vcofreq", strmhz(buf, bd->bi_vcofreq));
#endif
#if defined(CONFIG_CMD_NET)
print_eth(0);
@@ -69,7 +69,7 @@ void arch_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
print_eth(3);
#endif
- printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
+ printf("ip_addr = %pI4\n", &bd->bi_ip_addr);
#endif
- printf ("baudrate = %ld bps\n", bd->bi_baudrate);
+ printf("baudrate = %ld bps\n", bd->bi_baudrate);
}
diff --git a/lib_microblaze/bdinfo.c b/lib_microblaze/bdinfo.c
index eba2f4d..908f94e 100644
--- a/lib_microblaze/bdinfo.c
+++ b/lib_microblaze/bdinfo.c
@@ -34,18 +34,18 @@ void arch_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
{
bd_t *bd = gd->bd;
- print_num ("mem start ", (ulong)bd->bi_memstart);
- print_lnum ("mem size ", (u64)bd->bi_memsize);
- print_num ("flash start ", (ulong)bd->bi_flashstart);
- print_num ("flash size ", (ulong)bd->bi_flashsize);
- print_num ("flash offset ", (ulong)bd->bi_flashoffset);
+ print_num("mem start ", (ulong)bd->bi_memstart);
+ print_lnum("mem size ", (u64)bd->bi_memsize);
+ print_num("flash start ", (ulong)bd->bi_flashstart);
+ print_num("flash size ", (ulong)bd->bi_flashsize);
+ print_num("flash offset ", (ulong)bd->bi_flashoffset);
#if defined(CONFIG_SYS_SRAM_BASE)
- print_num ("sram start ", (ulong)bd->bi_sramstart);
- print_num ("sram size ", (ulong)bd->bi_sramsize);
+ print_num("sram start ", (ulong)bd->bi_sramstart);
+ print_num("sram size ", (ulong)bd->bi_sramsize);
#endif
#if defined(CONFIG_CMD_NET)
print_eth(0);
- printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
+ printf("ip_addr = %pI4\n", &bd->bi_ip_addr);
#endif
- printf ("baudrate = %ld bps\n", (ulong)bd->bi_baudrate);
+ printf("baudrate = %ld bps\n", (ulong)bd->bi_baudrate);
}
diff --git a/lib_mips/bdinfo.c b/lib_mips/bdinfo.c
index 616481d..a040c7a 100644
--- a/lib_mips/bdinfo.c
+++ b/lib_mips/bdinfo.c
@@ -34,14 +34,14 @@ void arch_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
{
bd_t *bd = gd->bd;
- print_num ("boot_params", (ulong)bd->bi_boot_params);
- print_num ("memstart", (ulong)bd->bi_memstart);
- print_lnum ("memsize", (u64)bd->bi_memsize);
- print_num ("flashstart", (ulong)bd->bi_flashstart);
- print_num ("flashsize", (ulong)bd->bi_flashsize);
- print_num ("flashoffset", (ulong)bd->bi_flashoffset);
+ print_num("boot_params", (ulong)bd->bi_boot_params);
+ print_num("memstart", (ulong)bd->bi_memstart);
+ print_lnum("memsize", (u64)bd->bi_memsize);
+ print_num("flashstart", (ulong)bd->bi_flashstart);
+ print_num("flashsize", (ulong)bd->bi_flashsize);
+ print_num("flashoffset", (ulong)bd->bi_flashoffset);
print_eth(0);
- printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
- printf ("baudrate = %d bps\n", bd->bi_baudrate);
+ printf("ip_addr = %pI4\n", &bd->bi_ip_addr);
+ printf("baudrate = %d bps\n", bd->bi_baudrate);
}
diff --git a/lib_nios/bdinfo.c b/lib_nios/bdinfo.c
index 6e42c24..2959c9d 100644
--- a/lib_nios/bdinfo.c
+++ b/lib_nios/bdinfo.c
@@ -34,13 +34,13 @@ void arch_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
{
bd_t *bd = gd->bd;
- print_num ("memstart", (ulong)bd->bi_memstart);
- print_lnum ("memsize", (u64)bd->bi_memsize);
- print_num ("flashstart", (ulong)bd->bi_flashstart);
- print_num ("flashsize", (ulong)bd->bi_flashsize);
- print_num ("flashoffset", (ulong)bd->bi_flashoffset);
+ print_num("memstart", (ulong)bd->bi_memstart);
+ print_lnum("memsize", (u64)bd->bi_memsize);
+ print_num("flashstart", (ulong)bd->bi_flashstart);
+ print_num("flashsize", (ulong)bd->bi_flashsize);
+ print_num("flashoffset", (ulong)bd->bi_flashoffset);
print_eth(0);
- printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
- printf ("baudrate = %ld bps\n", bd->bi_baudrate);
+ printf("ip_addr = %pI4\n", &bd->bi_ip_addr);
+ printf("baudrate = %ld bps\n", bd->bi_baudrate);
}
diff --git a/lib_nios2/bdinfo.c b/lib_nios2/bdinfo.c
index 5b39fb1..95836c6 100644
--- a/lib_nios2/bdinfo.c
+++ b/lib_nios2/bdinfo.c
@@ -34,21 +34,21 @@ void arch_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
{
bd_t *bd = gd->bd;
- print_num ("mem start", (ulong)bd->bi_memstart);
- print_lnum ("mem size", (u64)bd->bi_memsize);
- print_num ("flash start", (ulong)bd->bi_flashstart);
- print_num ("flash size", (ulong)bd->bi_flashsize);
- print_num ("flash offset", (ulong)bd->bi_flashoffset);
+ print_num("mem start", (ulong)bd->bi_memstart);
+ print_lnum("mem size", (u64)bd->bi_memsize);
+ print_num("flash start", (ulong)bd->bi_flashstart);
+ print_num("flash size", (ulong)bd->bi_flashsize);
+ print_num("flash offset", (ulong)bd->bi_flashoffset);
#if defined(CONFIG_SYS_SRAM_BASE)
- print_num ("sram start", (ulong)bd->bi_sramstart);
- print_num ("sram size", (ulong)bd->bi_sramsize);
+ print_num("sram start", (ulong)bd->bi_sramstart);
+ print_num("sram size", (ulong)bd->bi_sramsize);
#endif
#if defined(CONFIG_CMD_NET)
print_eth(0);
- printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
+ printf("ip_addr = %pI4\n", &bd->bi_ip_addr);
#endif
- printf ("baudrate = %ld bps\n", bd->bi_baudrate);
+ printf("baudrate = %ld bps\n", bd->bi_baudrate);
}
diff --git a/lib_ppc/bdinfo.c b/lib_ppc/bdinfo.c
index 5aad37c..80a5470 100644
--- a/lib_ppc/bdinfo.c
+++ b/lib_ppc/bdinfo.c
@@ -36,50 +36,50 @@ void arch_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
char buf[32];
#ifdef DEBUG
- print_num ("bd address", (ulong)bd );
+ 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 ("flashsize", bd->bi_flashsize );
- print_num ("flashoffset", bd->bi_flashoffset );
- print_num ("sramstart", bd->bi_sramstart );
- print_num ("sramsize", bd->bi_sramsize );
+ print_num("memstart", bd->bi_memstart );
+ print_lnum("memsize", bd->bi_memsize );
+ print_num("flashstart", bd->bi_flashstart );
+ print_num("flashsize", bd->bi_flashsize );
+ print_num("flashoffset", bd->bi_flashoffset );
+ print_num("sramstart", bd->bi_sramstart );
+ print_num("sramsize", bd->bi_sramsize );
#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || \
defined(CONFIG_8260) || defined(CONFIG_E500)
- print_num ("immr_base", bd->bi_immr_base );
+ print_num("immr_base", bd->bi_immr_base );
#endif
- print_num ("bootflags", bd->bi_bootflags );
+ print_num("bootflags", bd->bi_bootflags );
#if defined(CONFIG_405GP) || defined(CONFIG_405CR) || \
defined(CONFIG_405EP) || defined(CONFIG_XILINX_405) || \
defined(CONFIG_440EP) || defined(CONFIG_440GR) || \
defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_440SP) || defined(CONFIG_440SPE)
- print_str ("procfreq", strmhz(buf, bd->bi_procfreq));
- print_str ("plb_busfreq", strmhz(buf, bd->bi_plb_busfreq));
+ print_str("procfreq", strmhz(buf, bd->bi_procfreq));
+ print_str("plb_busfreq", strmhz(buf, bd->bi_plb_busfreq));
#if defined(CONFIG_405GP) || defined(CONFIG_405EP) ||
defined(CONFIG_XILINX_405) || \
defined(CONFIG_440EP) || defined(CONFIG_440GR) || defined(CONFIG_440SPE)
|| \
defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
- print_str ("pci_busfreq", strmhz(buf, bd->bi_pci_busfreq));
+ print_str("pci_busfreq", strmhz(buf, bd->bi_pci_busfreq));
#endif
#else /* ! CONFIG_405GP, CONFIG_405CR, CONFIG_405EP, CONFIG_XILINX_405,
CONFIG_440EP CONFIG_440GR */
#if defined(CONFIG_CPM2)
- print_str ("vco", strmhz(buf, bd->bi_vco));
- print_str ("sccfreq", strmhz(buf, bd->bi_sccfreq));
- print_str ("brgfreq", strmhz(buf, bd->bi_brgfreq));
+ print_str("vco", strmhz(buf, bd->bi_vco));
+ print_str("sccfreq", strmhz(buf, bd->bi_sccfreq));
+ print_str("brgfreq", strmhz(buf, bd->bi_brgfreq));
#endif
- print_str ("intfreq", strmhz(buf, bd->bi_intfreq));
+ print_str("intfreq", strmhz(buf, bd->bi_intfreq));
#if defined(CONFIG_CPM2)
- print_str ("cpmfreq", strmhz(buf, bd->bi_cpmfreq));
+ print_str("cpmfreq", strmhz(buf, bd->bi_cpmfreq));
#endif
- print_str ("busfreq", strmhz(buf, bd->bi_busfreq));
+ print_str("busfreq", strmhz(buf, bd->bi_busfreq));
#endif /* CONFIG_405GP, CONFIG_405CR, CONFIG_405EP, CONFIG_XILINX_405,
CONFIG_440EP CONFIG_440GR */
#if defined(CONFIG_MPC8220)
- print_str ("inpfreq", strmhz(buf, bd->bi_inpfreq));
- print_str ("flbfreq", strmhz(buf, bd->bi_flbfreq));
- print_str ("pcifreq", strmhz(buf, bd->bi_pcifreq));
- print_str ("vcofreq", strmhz(buf, bd->bi_vcofreq));
- print_str ("pevfreq", strmhz(buf, bd->bi_pevfreq));
+ print_str("inpfreq", strmhz(buf, bd->bi_inpfreq));
+ print_str("flbfreq", strmhz(buf, bd->bi_flbfreq));
+ print_str("pcifreq", strmhz(buf, bd->bi_pcifreq));
+ print_str("vcofreq", strmhz(buf, bd->bi_vcofreq));
+ print_str("pevfreq", strmhz(buf, bd->bi_pevfreq));
#endif
print_eth(0);
@@ -100,8 +100,8 @@ void arch_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
#endif
#ifdef CONFIG_HERMES
- print_str ("ethspeed", strmhz(buf, bd->bi_ethspeed));
+ print_str("ethspeed", strmhz(buf, bd->bi_ethspeed));
#endif
- printf ("IP addr = %pI4\n", &bd->bi_ip_addr);
- printf ("baudrate = %6ld bps\n", bd->bi_baudrate );
+ printf("IP addr = %pI4\n", &bd->bi_ip_addr);
+ printf("baudrate = %6ld bps\n", bd->bi_baudrate);
}
diff --git a/lib_sh/bdinfo.c b/lib_sh/bdinfo.c
index 616481d..a040c7a 100644
--- a/lib_sh/bdinfo.c
+++ b/lib_sh/bdinfo.c
@@ -34,14 +34,14 @@ void arch_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
{
bd_t *bd = gd->bd;
- print_num ("boot_params", (ulong)bd->bi_boot_params);
- print_num ("memstart", (ulong)bd->bi_memstart);
- print_lnum ("memsize", (u64)bd->bi_memsize);
- print_num ("flashstart", (ulong)bd->bi_flashstart);
- print_num ("flashsize", (ulong)bd->bi_flashsize);
- print_num ("flashoffset", (ulong)bd->bi_flashoffset);
+ print_num("boot_params", (ulong)bd->bi_boot_params);
+ print_num("memstart", (ulong)bd->bi_memstart);
+ print_lnum("memsize", (u64)bd->bi_memsize);
+ print_num("flashstart", (ulong)bd->bi_flashstart);
+ print_num("flashsize", (ulong)bd->bi_flashsize);
+ print_num("flashoffset", (ulong)bd->bi_flashoffset);
print_eth(0);
- printf ("ip_addr = %pI4\n", &bd->bi_ip_addr);
- printf ("baudrate = %d bps\n", bd->bi_baudrate);
+ printf("ip_addr = %pI4\n", &bd->bi_ip_addr);
+ printf("baudrate = %d bps\n", bd->bi_baudrate);
}
--
1.5.6.5
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
