[U-Boot] [PATCH 0/7] cmd/bdinfo: extract common parts and reuse them
Hi,
this series extracts common parts of cmd/bdinfo.c used by various architectures into reusable functions.
Please review.
Max Filippov (7): cmd/bdinfo: extract print_bi_boot_params cmd/bdinfo: extract print_bi_mem cmd/bdinfo: extract print_bi_dram cmd/bdinfo: extract print_bi_flash cmd/bdinfo: extract print_eth_ip_addr cmd/bdinfo: extract print_baudrate cmd/bdinfo: extract print_std_bdinfo
cmd/bdinfo.c | 326 +++++++++++++++++++++++++---------------------------------- 1 file changed, 140 insertions(+), 186 deletions(-)
print_bi_boot_params outputs boot parameters structure location.
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- cmd/bdinfo.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index f2435ab..60aaafb 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -69,6 +69,12 @@ static void print_mhz(const char *name, unsigned long hz) printf("%-12s= %6s MHz\n", name, strmhz(buf, hz)); }
+ +static inline void print_bi_boot_params(const bd_t *bd) +{ + print_num("boot_params", (ulong)bd->bi_boot_params); +} + #if defined(CONFIG_PPC) void __weak board_detail(void) { @@ -311,7 +317,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_mhz("CCLK", bd->bi_cclk); print_mhz("SCLK", bd->bi_sclk);
- print_num("boot_params", (ulong)bd->bi_boot_params); + print_bi_boot_params(bd); print_num("memstart", (ulong)bd->bi_memstart); print_lnum("memsize", (u64)bd->bi_memsize); print_num("flashstart", (ulong)bd->bi_flashstart); @@ -331,7 +337,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd;
- print_num("boot_params", (ulong)bd->bi_boot_params); + print_bi_boot_params(bd); print_num("memstart", (ulong)bd->bi_memstart); print_lnum("memsize", (u64)bd->bi_memsize); print_num("flashstart", (ulong)bd->bi_flashstart); @@ -353,7 +359,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd;
- print_num("boot_params", (ulong)bd->bi_boot_params); + print_bi_boot_params(bd); print_num("memstart", (ulong)bd->bi_dram[0].start); print_lnum("memsize", (u64)bd->bi_dram[0].size); print_num("flashstart", (ulong)bd->bi_flashstart); @@ -376,7 +382,7 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, bd_t *bd = gd->bd;
print_num("arch_number", bd->bi_arch_number); - print_num("boot_params", (ulong)bd->bi_boot_params); + print_bi_boot_params(bd);
for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) { print_num("DRAM bank", i); @@ -445,7 +451,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int i; bd_t *bd = gd->bd;
- print_num("boot_params", (ulong)bd->bi_boot_params); + 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); @@ -480,7 +486,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int i; bd_t *bd = gd->bd;
- print_num("boot_params", (ulong)bd->bi_boot_params); + print_bi_boot_params(bd);
for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) { print_num("DRAM bank", i); @@ -506,7 +512,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd;
print_num("arch_number", bd->bi_arch_number); - print_num("boot_params", (ulong)bd->bi_boot_params); + print_bi_boot_params(bd);
for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) { print_num("DRAM bank", i);
print_bi_mem outputs memstart and memsize lines.
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- cmd/bdinfo.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 60aaafb..df68b58 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -75,6 +75,23 @@ static inline void print_bi_boot_params(const bd_t *bd) print_num("boot_params", (ulong)bd->bi_boot_params); }
+static inline void print_bi_mem(const bd_t *bd) +{ +#if defined(CONFIG_SH) + print_num("mem start ", (ulong)bd->bi_memstart); + print_lnum("mem size ", (u64)bd->bi_memsize); +#elif defined(CONFIG_ARC) + print_num("mem start", (ulong)bd->bi_memstart); + print_lnum("mem size", (u64)bd->bi_memsize); +#elif defined(CONFIG_AVR32) + print_num("memstart", (ulong)bd->bi_dram[0].start); + print_lnum("memsize", (u64)bd->bi_dram[0].size); +#else + print_num("memstart", (ulong)bd->bi_memstart); + print_lnum("memsize", (u64)bd->bi_memsize); +#endif +} + #if defined(CONFIG_PPC) void __weak board_detail(void) { @@ -88,8 +105,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef DEBUG print_num("bd address", (ulong)bd); #endif - print_num("memstart", bd->bi_memstart); - print_lnum("memsize", bd->bi_memsize); + print_bi_mem(bd); print_num("flashstart", bd->bi_flashstart); print_num("flashsize", bd->bi_flashsize); print_num("flashoffset", bd->bi_flashoffset); @@ -263,8 +279,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd;
- print_num("memstart", (ulong)bd->bi_memstart); - print_lnum("memsize", (u64)bd->bi_memsize); + print_bi_mem(bd); print_num("flashstart", (ulong)bd->bi_flashstart); print_num("flashsize", (ulong)bd->bi_flashsize); print_num("flashoffset", (ulong)bd->bi_flashoffset); @@ -318,8 +333,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_mhz("SCLK", bd->bi_sclk);
print_bi_boot_params(bd); - print_num("memstart", (ulong)bd->bi_memstart); - print_lnum("memsize", (u64)bd->bi_memsize); + print_bi_mem(bd); print_num("flashstart", (ulong)bd->bi_flashstart); print_num("flashsize", (ulong)bd->bi_flashsize); print_num("flashoffset", (ulong)bd->bi_flashoffset); @@ -338,8 +352,7 @@ 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("memstart", (ulong)bd->bi_memstart); - print_lnum("memsize", (u64)bd->bi_memsize); + print_bi_mem(bd); print_num("flashstart", (ulong)bd->bi_flashstart); print_num("flashsize", (ulong)bd->bi_flashsize); print_num("flashoffset", (ulong)bd->bi_flashoffset); @@ -360,8 +373,7 @@ 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("memstart", (ulong)bd->bi_dram[0].start); - print_lnum("memsize", (u64)bd->bi_dram[0].size); + print_bi_mem(bd); print_num("flashstart", (ulong)bd->bi_flashstart); print_num("flashsize", (ulong)bd->bi_flashsize); print_num("flashoffset", (ulong)bd->bi_flashoffset); @@ -430,8 +442,8 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd; - print_num("mem start ", (ulong)bd->bi_memstart); - print_lnum("mem size ", (u64)bd->bi_memsize); + + print_bi_mem(bd); print_num("flash start ", (ulong)bd->bi_flashstart); print_num("flash size ", (ulong)bd->bi_flashsize); print_num("flash offset ", (ulong)bd->bi_flashoffset); @@ -535,8 +547,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd;
- print_num("mem start", (ulong)bd->bi_memstart); - print_lnum("mem size", (u64)bd->bi_memsize); + print_bi_mem(bd); print_num("flash start", (ulong)bd->bi_flashstart); print_num("flash size", (ulong)bd->bi_flashsize); print_num("flash offset", (ulong)bd->bi_flashoffset); @@ -557,8 +568,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd;
- print_num("mem start", bd->bi_memstart); - print_lnum("mem size", bd->bi_memsize); + print_bi_mem(bd);
#if defined(CONFIG_CMD_NET) print_eth(0);
print_bi_dram outputs start address and size for each DRAM bank.
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- cmd/bdinfo.c | 58 +++++++++++++++++----------------------------------------- 1 file changed, 17 insertions(+), 41 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index df68b58..2f37232 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -92,6 +92,17 @@ static inline void print_bi_mem(const bd_t *bd) #endif }
+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 defined(CONFIG_PPC) void __weak board_detail(void) { @@ -179,15 +190,9 @@ 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;
- 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_bi_dram(bd); print_num("flash start", (ulong)bd->bi_flashstart); print_num("flash size", (ulong)bd->bi_flashsize); print_num("flash offset", (ulong)bd->bi_flashoffset); @@ -212,14 +217,8 @@ 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; - 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); - }
+ print_bi_dram(bd); print_num("flash start ", (ulong)bd->bi_flashstart); print_num("flash size ", (ulong)bd->bi_flashsize); print_num("flash offset ", (ulong)bd->bi_flashoffset); @@ -390,17 +389,11 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - int i; bd_t *bd = gd->bd;
print_num("arch_number", bd->bi_arch_number); print_bi_boot_params(bd); - - 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_bi_dram(bd);
#ifdef CONFIG_SYS_MEM_RESERVE_SECURE if (gd->arch.secure_ram & MEM_RESERVE_SECURE_SECURED) { @@ -460,7 +453,6 @@ 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_bi_boot_params(bd); @@ -475,11 +467,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_mhz("cpufreq", bd->bi_intfreq); print_mhz("busfreq", bd->bi_busfreq);
- 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_bi_dram(bd);
#if defined(CONFIG_CMD_NET) print_eth(0); @@ -495,16 +483,10 @@ 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_bi_boot_params(bd); - - 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_bi_dram(bd);
#if defined(CONFIG_CMD_NET) print_eth(0); @@ -520,17 +502,11 @@ 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("arch_number", bd->bi_arch_number); print_bi_boot_params(bd); - - 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_bi_dram(bd);
#if defined(CONFIG_CMD_NET) print_eth(0);
print_bi_mem outputs memstart and memsize lines.
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- cmd/bdinfo.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 60aaafb..df68b58 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -75,6 +75,23 @@ static inline void print_bi_boot_params(const bd_t *bd) print_num("boot_params", (ulong)bd->bi_boot_params); }
+static inline void print_bi_mem(const bd_t *bd) +{ +#if defined(CONFIG_SH) + print_num("mem start ", (ulong)bd->bi_memstart); + print_lnum("mem size ", (u64)bd->bi_memsize); +#elif defined(CONFIG_ARC) + print_num("mem start", (ulong)bd->bi_memstart); + print_lnum("mem size", (u64)bd->bi_memsize); +#elif defined(CONFIG_AVR32) + print_num("memstart", (ulong)bd->bi_dram[0].start); + print_lnum("memsize", (u64)bd->bi_dram[0].size); +#else + print_num("memstart", (ulong)bd->bi_memstart); + print_lnum("memsize", (u64)bd->bi_memsize); +#endif +} + #if defined(CONFIG_PPC) void __weak board_detail(void) { @@ -88,8 +105,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef DEBUG print_num("bd address", (ulong)bd); #endif - print_num("memstart", bd->bi_memstart); - print_lnum("memsize", bd->bi_memsize); + print_bi_mem(bd); print_num("flashstart", bd->bi_flashstart); print_num("flashsize", bd->bi_flashsize); print_num("flashoffset", bd->bi_flashoffset); @@ -263,8 +279,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd;
- print_num("memstart", (ulong)bd->bi_memstart); - print_lnum("memsize", (u64)bd->bi_memsize); + print_bi_mem(bd); print_num("flashstart", (ulong)bd->bi_flashstart); print_num("flashsize", (ulong)bd->bi_flashsize); print_num("flashoffset", (ulong)bd->bi_flashoffset); @@ -318,8 +333,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_mhz("SCLK", bd->bi_sclk);
print_bi_boot_params(bd); - print_num("memstart", (ulong)bd->bi_memstart); - print_lnum("memsize", (u64)bd->bi_memsize); + print_bi_mem(bd); print_num("flashstart", (ulong)bd->bi_flashstart); print_num("flashsize", (ulong)bd->bi_flashsize); print_num("flashoffset", (ulong)bd->bi_flashoffset); @@ -338,8 +352,7 @@ 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("memstart", (ulong)bd->bi_memstart); - print_lnum("memsize", (u64)bd->bi_memsize); + print_bi_mem(bd); print_num("flashstart", (ulong)bd->bi_flashstart); print_num("flashsize", (ulong)bd->bi_flashsize); print_num("flashoffset", (ulong)bd->bi_flashoffset); @@ -360,8 +373,7 @@ 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("memstart", (ulong)bd->bi_dram[0].start); - print_lnum("memsize", (u64)bd->bi_dram[0].size); + print_bi_mem(bd); print_num("flashstart", (ulong)bd->bi_flashstart); print_num("flashsize", (ulong)bd->bi_flashsize); print_num("flashoffset", (ulong)bd->bi_flashoffset); @@ -430,8 +442,8 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd; - print_num("mem start ", (ulong)bd->bi_memstart); - print_lnum("mem size ", (u64)bd->bi_memsize); + + print_bi_mem(bd); print_num("flash start ", (ulong)bd->bi_flashstart); print_num("flash size ", (ulong)bd->bi_flashsize); print_num("flash offset ", (ulong)bd->bi_flashoffset); @@ -535,8 +547,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd;
- print_num("mem start", (ulong)bd->bi_memstart); - print_lnum("mem size", (u64)bd->bi_memsize); + print_bi_mem(bd); print_num("flash start", (ulong)bd->bi_flashstart); print_num("flash size", (ulong)bd->bi_flashsize); print_num("flash offset", (ulong)bd->bi_flashoffset); @@ -557,8 +568,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd;
- print_num("mem start", bd->bi_memstart); - print_lnum("mem size", bd->bi_memsize); + print_bi_mem(bd);
#if defined(CONFIG_CMD_NET) print_eth(0);
print_bi_dram outputs start address and size for each DRAM bank.
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- cmd/bdinfo.c | 58 +++++++++++++++++----------------------------------------- 1 file changed, 17 insertions(+), 41 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index df68b58..2f37232 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -92,6 +92,17 @@ static inline void print_bi_mem(const bd_t *bd) #endif }
+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 defined(CONFIG_PPC) void __weak board_detail(void) { @@ -179,15 +190,9 @@ 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;
- 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_bi_dram(bd); print_num("flash start", (ulong)bd->bi_flashstart); print_num("flash size", (ulong)bd->bi_flashsize); print_num("flash offset", (ulong)bd->bi_flashoffset); @@ -212,14 +217,8 @@ 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; - 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); - }
+ print_bi_dram(bd); print_num("flash start ", (ulong)bd->bi_flashstart); print_num("flash size ", (ulong)bd->bi_flashsize); print_num("flash offset ", (ulong)bd->bi_flashoffset); @@ -390,17 +389,11 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - int i; bd_t *bd = gd->bd;
print_num("arch_number", bd->bi_arch_number); print_bi_boot_params(bd); - - 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_bi_dram(bd);
#ifdef CONFIG_SYS_MEM_RESERVE_SECURE if (gd->arch.secure_ram & MEM_RESERVE_SECURE_SECURED) { @@ -460,7 +453,6 @@ 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_bi_boot_params(bd); @@ -475,11 +467,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_mhz("cpufreq", bd->bi_intfreq); print_mhz("busfreq", bd->bi_busfreq);
- 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_bi_dram(bd);
#if defined(CONFIG_CMD_NET) print_eth(0); @@ -495,16 +483,10 @@ 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_bi_boot_params(bd); - - 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_bi_dram(bd);
#if defined(CONFIG_CMD_NET) print_eth(0); @@ -520,17 +502,11 @@ 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("arch_number", bd->bi_arch_number); print_bi_boot_params(bd); - - 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_bi_dram(bd);
#if defined(CONFIG_CMD_NET) print_eth(0);
print_bi_flash outputs flashstart, flashsize and flashoffset lines.
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- cmd/bdinfo.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 2f37232..f89de5f 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -103,6 +103,24 @@ static inline void print_bi_dram(const bd_t *bd) } }
+static inline void print_bi_flash(const bd_t *bd) +{ +#if defined(CONFIG_MICROBLAZE) || defined(CONFIG_SH) + print_num("flash start ", (ulong)bd->bi_flashstart); + print_num("flash size ", (ulong)bd->bi_flashsize); + print_num("flash offset ", (ulong)bd->bi_flashoffset); + +#elif defined(CONFIG_NIOS2) || defined(CONFIG_OPENRISC) + print_num("flash start", (ulong)bd->bi_flashstart); + print_num("flash size", (ulong)bd->bi_flashsize); + print_num("flash offset", (ulong)bd->bi_flashoffset); +#else + print_num("flashstart", (ulong)bd->bi_flashstart); + print_num("flashsize", (ulong)bd->bi_flashsize); + print_num("flashoffset", (ulong)bd->bi_flashoffset); +#endif +} + #if defined(CONFIG_PPC) void __weak board_detail(void) { @@ -117,9 +135,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_num("bd address", (ulong)bd); #endif print_bi_mem(bd); - print_num("flashstart", bd->bi_flashstart); - print_num("flashsize", bd->bi_flashsize); - print_num("flashoffset", bd->bi_flashoffset); + print_bi_flash(bd); print_num("sramstart", bd->bi_sramstart); print_num("sramsize", bd->bi_sramsize); #if defined(CONFIG_5xx) || defined(CONFIG_8xx) || \ @@ -193,9 +209,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd;
print_bi_dram(bd); - 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_bi_flash(bd);
#if defined(CONFIG_SYS_SRAM_BASE) print_num ("sram start", (ulong)bd->bi_sramstart); @@ -219,9 +233,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd;
print_bi_dram(bd); - 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_bi_flash(bd); #if defined(CONFIG_SYS_SRAM_BASE) print_num("sram start ", (ulong)bd->bi_sramstart); print_num("sram size ", (ulong)bd->bi_sramsize); @@ -279,9 +291,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd;
print_bi_mem(bd); - print_num("flashstart", (ulong)bd->bi_flashstart); - print_num("flashsize", (ulong)bd->bi_flashsize); - print_num("flashoffset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd); #if defined(CONFIG_SYS_INIT_RAM_ADDR) print_num("sramstart", (ulong)bd->bi_sramstart); print_num("sramsize", (ulong)bd->bi_sramsize); @@ -333,9 +343,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_bi_boot_params(bd); print_bi_mem(bd); - print_num("flashstart", (ulong)bd->bi_flashstart); - print_num("flashsize", (ulong)bd->bi_flashsize); - print_num("flashoffset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd);
print_eth(0); printf("ip_addr = %s\n", getenv("ipaddr")); @@ -352,9 +360,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_bi_boot_params(bd); print_bi_mem(bd); - print_num("flashstart", (ulong)bd->bi_flashstart); - print_num("flashsize", (ulong)bd->bi_flashsize); - print_num("flashoffset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd);
print_eth(0); printf("ip_addr = %s\n", getenv("ipaddr")); @@ -373,9 +379,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_bi_boot_params(bd); print_bi_mem(bd); - print_num("flashstart", (ulong)bd->bi_flashstart); - print_num("flashsize", (ulong)bd->bi_flashsize); - print_num("flashoffset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd);
print_eth(0); printf("ip_addr = %s\n", getenv("ipaddr")); @@ -437,9 +441,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd;
print_bi_mem(bd); - 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_bi_flash(bd);
#if defined(CONFIG_CMD_NET) print_eth(0); @@ -524,9 +526,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd;
print_bi_mem(bd); - 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_bi_flash(bd);
#if defined(CONFIG_CMD_NET) print_eth(0);
print_bi_flash outputs flashstart, flashsize and flashoffset lines.
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- cmd/bdinfo.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 2f37232..f89de5f 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -103,6 +103,24 @@ static inline void print_bi_dram(const bd_t *bd) } }
+static inline void print_bi_flash(const bd_t *bd) +{ +#if defined(CONFIG_MICROBLAZE) || defined(CONFIG_SH) + print_num("flash start ", (ulong)bd->bi_flashstart); + print_num("flash size ", (ulong)bd->bi_flashsize); + print_num("flash offset ", (ulong)bd->bi_flashoffset); + +#elif defined(CONFIG_NIOS2) || defined(CONFIG_OPENRISC) + print_num("flash start", (ulong)bd->bi_flashstart); + print_num("flash size", (ulong)bd->bi_flashsize); + print_num("flash offset", (ulong)bd->bi_flashoffset); +#else + print_num("flashstart", (ulong)bd->bi_flashstart); + print_num("flashsize", (ulong)bd->bi_flashsize); + print_num("flashoffset", (ulong)bd->bi_flashoffset); +#endif +} + #if defined(CONFIG_PPC) void __weak board_detail(void) { @@ -117,9 +135,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_num("bd address", (ulong)bd); #endif print_bi_mem(bd); - print_num("flashstart", bd->bi_flashstart); - print_num("flashsize", bd->bi_flashsize); - print_num("flashoffset", bd->bi_flashoffset); + print_bi_flash(bd); print_num("sramstart", bd->bi_sramstart); print_num("sramsize", bd->bi_sramsize); #if defined(CONFIG_5xx) || defined(CONFIG_8xx) || \ @@ -193,9 +209,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd;
print_bi_dram(bd); - 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_bi_flash(bd);
#if defined(CONFIG_SYS_SRAM_BASE) print_num ("sram start", (ulong)bd->bi_sramstart); @@ -219,9 +233,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd;
print_bi_dram(bd); - 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_bi_flash(bd); #if defined(CONFIG_SYS_SRAM_BASE) print_num("sram start ", (ulong)bd->bi_sramstart); print_num("sram size ", (ulong)bd->bi_sramsize); @@ -279,9 +291,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd;
print_bi_mem(bd); - print_num("flashstart", (ulong)bd->bi_flashstart); - print_num("flashsize", (ulong)bd->bi_flashsize); - print_num("flashoffset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd); #if defined(CONFIG_SYS_INIT_RAM_ADDR) print_num("sramstart", (ulong)bd->bi_sramstart); print_num("sramsize", (ulong)bd->bi_sramsize); @@ -333,9 +343,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_bi_boot_params(bd); print_bi_mem(bd); - print_num("flashstart", (ulong)bd->bi_flashstart); - print_num("flashsize", (ulong)bd->bi_flashsize); - print_num("flashoffset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd);
print_eth(0); printf("ip_addr = %s\n", getenv("ipaddr")); @@ -352,9 +360,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_bi_boot_params(bd); print_bi_mem(bd); - print_num("flashstart", (ulong)bd->bi_flashstart); - print_num("flashsize", (ulong)bd->bi_flashsize); - print_num("flashoffset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd);
print_eth(0); printf("ip_addr = %s\n", getenv("ipaddr")); @@ -373,9 +379,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_bi_boot_params(bd); print_bi_mem(bd); - print_num("flashstart", (ulong)bd->bi_flashstart); - print_num("flashsize", (ulong)bd->bi_flashsize); - print_num("flashoffset", (ulong)bd->bi_flashoffset); + print_bi_flash(bd);
print_eth(0); printf("ip_addr = %s\n", getenv("ipaddr")); @@ -437,9 +441,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd;
print_bi_mem(bd); - 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_bi_flash(bd);
#if defined(CONFIG_CMD_NET) print_eth(0); @@ -524,9 +526,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd;
print_bi_mem(bd); - 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_bi_flash(bd);
#if defined(CONFIG_CMD_NET) print_eth(0);
print_eth_ip_addr outputs eth configurations for up to 6 interfaces and configured IP address.
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- cmd/bdinfo.c | 113 +++++++++++++++++++---------------------------------------- 1 file changed, 36 insertions(+), 77 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index f89de5f..ab56ea5 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -121,6 +121,29 @@ static inline void print_bi_flash(const bd_t *bd) #endif }
+static inline void print_eth_ip_addr(void) +{ +#if defined(CONFIG_CMD_NET) + print_eth(0); +#if defined(CONFIG_HAS_ETH1) + print_eth(1); +#endif +#if defined(CONFIG_HAS_ETH2) + print_eth(2); +#endif +#if defined(CONFIG_HAS_ETH3) + print_eth(3); +#endif +#if defined(CONFIG_HAS_ETH4) + print_eth(4); +#endif +#if defined(CONFIG_HAS_ETH5) + print_eth(5); +#endif + printf("IP addr = %s\n", getenv("ipaddr")); +#endif +} + #if defined(CONFIG_PPC) void __weak board_detail(void) { @@ -178,24 +201,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif #endif
- print_eth(0); -#if defined(CONFIG_HAS_ETH1) - print_eth(1); -#endif -#if defined(CONFIG_HAS_ETH2) - print_eth(2); -#endif -#if defined(CONFIG_HAS_ETH3) - print_eth(3); -#endif -#if defined(CONFIG_HAS_ETH4) - print_eth(4); -#endif -#if defined(CONFIG_HAS_ETH5) - print_eth(5); -#endif - - printf("IP addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); printf("baudrate = %6u bps\n", gd->baudrate); print_num("relocaddr", gd->relocaddr); board_detail(); @@ -216,11 +222,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_num ("sram size", (ulong)bd->bi_sramsize); #endif
-#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif - + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate);
return 0; @@ -276,10 +278,7 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) printf("CONFIG_SYS_GBL_DATA_OFFSET = 0x%x (%d)\n", CONFIG_SYS_GBL_DATA_OFFSET, GENERATED_GBL_DATA_SIZE);
-#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %6u bps\n", gd->baudrate); return 0; } @@ -309,20 +308,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_mhz("inpfreq", bd->bi_inpfreq); print_mhz("vcofreq", bd->bi_vcofreq); #endif -#if defined(CONFIG_CMD_NET) - print_eth(0); -#if defined(CONFIG_HAS_ETH1) - print_eth(1); -#endif -#if defined(CONFIG_HAS_ETH2) - print_eth(2); -#endif -#if defined(CONFIG_HAS_ETH3) - print_eth(3); -#endif - - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate);
return 0; @@ -344,9 +330,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_boot_params(bd); print_bi_mem(bd); print_bi_flash(bd); - - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate);
return 0; @@ -361,9 +345,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_boot_params(bd); print_bi_mem(bd); print_bi_flash(bd); - - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate); print_num("relocaddr", gd->relocaddr); print_num("reloc off", gd->reloc_off); @@ -380,9 +362,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_boot_params(bd); print_bi_mem(bd); print_bi_flash(bd); - - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate);
return 0; @@ -442,11 +422,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_bi_mem(bd); print_bi_flash(bd); - -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate); return 0; } @@ -472,8 +448,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_dram(bd);
#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); print_mhz("ethspeed", bd->bi_ethspeed); #endif printf("baudrate = %u bps\n", gd->baudrate); @@ -489,11 +464,8 @@ 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();
-#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) print_num("FB base ", gd->fb_base); #endif @@ -509,11 +481,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_num("arch_number", bd->bi_arch_number); print_bi_boot_params(bd); print_bi_dram(bd); - -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate);
return 0; @@ -527,12 +495,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_bi_mem(bd); print_bi_flash(bd); - -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif - + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate);
return 0; @@ -545,11 +508,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd;
print_bi_mem(bd); - -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %d bps\n", gd->baudrate);
return 0;
print_baudrate outputs serial baud rate.
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- cmd/bdinfo.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index ab56ea5..b4abb91 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -144,6 +144,17 @@ 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); +#elif defined(CONFIG_SPARC) + printf("baudrate = %6u bps\n", gd->baudrate); +#else + printf("baudrate = %u bps\n", gd->baudrate); +#endif +} + #if defined(CONFIG_PPC) void __weak board_detail(void) { @@ -202,7 +213,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; @@ -223,7 +234,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; } @@ -243,7 +254,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); @@ -279,7 +290,7 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) GENERATED_GBL_DATA_SIZE);
print_eth_ip_addr(); - printf("baudrate = %6u bps\n", gd->baudrate); + print_baudrate(); return 0; }
@@ -309,7 +320,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); + print_baudrate();
return 0; } @@ -331,7 +342,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; } @@ -346,7 +357,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(); print_num("relocaddr", gd->relocaddr); print_num("reloc off", gd->reloc_off);
@@ -363,7 +374,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; } @@ -388,7 +399,7 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, #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 @@ -423,7 +434,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; }
@@ -451,7 +462,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; } @@ -482,7 +493,7 @@ 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; } @@ -496,7 +507,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; } @@ -509,7 +520,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_bi_mem(bd); print_eth_ip_addr(); - printf("baudrate = %d bps\n", gd->baudrate); + print_baudrate();
return 0; }
print_eth_ip_addr outputs eth configurations for up to 6 interfaces and configured IP address.
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- cmd/bdinfo.c | 113 +++++++++++++++++++---------------------------------------- 1 file changed, 36 insertions(+), 77 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index f89de5f..ab56ea5 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -121,6 +121,29 @@ static inline void print_bi_flash(const bd_t *bd) #endif }
+static inline void print_eth_ip_addr(void) +{ +#if defined(CONFIG_CMD_NET) + print_eth(0); +#if defined(CONFIG_HAS_ETH1) + print_eth(1); +#endif +#if defined(CONFIG_HAS_ETH2) + print_eth(2); +#endif +#if defined(CONFIG_HAS_ETH3) + print_eth(3); +#endif +#if defined(CONFIG_HAS_ETH4) + print_eth(4); +#endif +#if defined(CONFIG_HAS_ETH5) + print_eth(5); +#endif + printf("IP addr = %s\n", getenv("ipaddr")); +#endif +} + #if defined(CONFIG_PPC) void __weak board_detail(void) { @@ -178,24 +201,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif #endif
- print_eth(0); -#if defined(CONFIG_HAS_ETH1) - print_eth(1); -#endif -#if defined(CONFIG_HAS_ETH2) - print_eth(2); -#endif -#if defined(CONFIG_HAS_ETH3) - print_eth(3); -#endif -#if defined(CONFIG_HAS_ETH4) - print_eth(4); -#endif -#if defined(CONFIG_HAS_ETH5) - print_eth(5); -#endif - - printf("IP addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); printf("baudrate = %6u bps\n", gd->baudrate); print_num("relocaddr", gd->relocaddr); board_detail(); @@ -216,11 +222,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_num ("sram size", (ulong)bd->bi_sramsize); #endif
-#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif - + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate);
return 0; @@ -276,10 +278,7 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) printf("CONFIG_SYS_GBL_DATA_OFFSET = 0x%x (%d)\n", CONFIG_SYS_GBL_DATA_OFFSET, GENERATED_GBL_DATA_SIZE);
-#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %6u bps\n", gd->baudrate); return 0; } @@ -309,20 +308,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_mhz("inpfreq", bd->bi_inpfreq); print_mhz("vcofreq", bd->bi_vcofreq); #endif -#if defined(CONFIG_CMD_NET) - print_eth(0); -#if defined(CONFIG_HAS_ETH1) - print_eth(1); -#endif -#if defined(CONFIG_HAS_ETH2) - print_eth(2); -#endif -#if defined(CONFIG_HAS_ETH3) - print_eth(3); -#endif - - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate);
return 0; @@ -344,9 +330,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_boot_params(bd); print_bi_mem(bd); print_bi_flash(bd); - - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate);
return 0; @@ -361,9 +345,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_boot_params(bd); print_bi_mem(bd); print_bi_flash(bd); - - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate); print_num("relocaddr", gd->relocaddr); print_num("reloc off", gd->reloc_off); @@ -380,9 +362,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_boot_params(bd); print_bi_mem(bd); print_bi_flash(bd); - - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate);
return 0; @@ -442,11 +422,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_bi_mem(bd); print_bi_flash(bd); - -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate); return 0; } @@ -472,8 +448,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_dram(bd);
#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); + print_eth_ip_addr(); print_mhz("ethspeed", bd->bi_ethspeed); #endif printf("baudrate = %u bps\n", gd->baudrate); @@ -489,11 +464,8 @@ 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();
-#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) print_num("FB base ", gd->fb_base); #endif @@ -509,11 +481,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_num("arch_number", bd->bi_arch_number); print_bi_boot_params(bd); print_bi_dram(bd); - -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate);
return 0; @@ -527,12 +495,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_bi_mem(bd); print_bi_flash(bd); - -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif - + print_eth_ip_addr(); printf("baudrate = %u bps\n", gd->baudrate);
return 0; @@ -545,11 +508,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bd_t *bd = gd->bd;
print_bi_mem(bd); - -#if defined(CONFIG_CMD_NET) - print_eth(0); - printf("ip_addr = %s\n", getenv("ipaddr")); -#endif + print_eth_ip_addr(); printf("baudrate = %d bps\n", gd->baudrate);
return 0;
print_baudrate outputs serial baud rate.
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- cmd/bdinfo.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index ab56ea5..b4abb91 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -144,6 +144,17 @@ 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); +#elif defined(CONFIG_SPARC) + printf("baudrate = %6u bps\n", gd->baudrate); +#else + printf("baudrate = %u bps\n", gd->baudrate); +#endif +} + #if defined(CONFIG_PPC) void __weak board_detail(void) { @@ -202,7 +213,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; @@ -223,7 +234,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; } @@ -243,7 +254,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); @@ -279,7 +290,7 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) GENERATED_GBL_DATA_SIZE);
print_eth_ip_addr(); - printf("baudrate = %6u bps\n", gd->baudrate); + print_baudrate(); return 0; }
@@ -309,7 +320,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); + print_baudrate();
return 0; } @@ -331,7 +342,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; } @@ -346,7 +357,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(); print_num("relocaddr", gd->relocaddr); print_num("reloc off", gd->reloc_off);
@@ -363,7 +374,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; } @@ -388,7 +399,7 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, #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 @@ -423,7 +434,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; }
@@ -451,7 +462,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; } @@ -482,7 +493,7 @@ 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; } @@ -496,7 +507,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; } @@ -509,7 +520,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_bi_mem(bd); print_eth_ip_addr(); - printf("baudrate = %d bps\n", gd->baudrate); + print_baudrate();
return 0; }
print_std_bdinfo outputs typical set of board information entries: boot params location, memory and flash addresses and sizes, network interfaces information and configured serial baud rate.
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- cmd/bdinfo.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index b4abb91..4210ae9 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -155,6 +155,15 @@ static inline void print_baudrate(void) #endif }
+static inline void 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) { @@ -338,11 +347,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) 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(); - print_baudrate(); + print_std_bdinfo(bd);
return 0; } @@ -351,13 +356,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(); - print_baudrate(); + print_std_bdinfo(gd->bd); print_num("relocaddr", gd->relocaddr); print_num("reloc off", gd->reloc_off);
@@ -368,14 +367,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(); - print_baudrate(); - + print_std_bdinfo(gd->bd); return 0; }
On Wed, Jul 27, 2016 at 8:27 AM, Max Filippov jcmvbkbc@gmail.com wrote:
Hi,
this series extracts common parts of cmd/bdinfo.c used by various architectures into reusable functions.
Sorry, messed up my patch directory, will resend.
participants (1)
-
Max Filippov