X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cmd%2Fbdinfo.c;h=8971697e60a65a85ab37b953fa54e4e6ae2b65c9;hb=83605d37b00168d4960a752cff898d09d3062015;hp=19b8fd88fa3f8b17f00d159c3e06c96835b87acf;hpb=b504ff9f6bbdd4d3700595f64f3c30c5c9f70d35;p=oweals%2Fu-boot.git diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 19b8fd88fa..8971697e60 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -83,9 +83,6 @@ static inline void print_bi_mem(const bd_t *bd) #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); @@ -114,7 +111,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); @@ -152,14 +149,12 @@ 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 } -static inline void print_std_bdinfo(const bd_t *bd) +static inline void __maybe_unused print_std_bdinfo(const bd_t *bd) { print_bi_boot_params(bd); print_bi_mem(bd); @@ -185,26 +180,10 @@ 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) || \ - defined(CONFIG_MPC8260) || defined(CONFIG_E500) +#if defined(CONFIG_8xx) || defined(CONFIG_E500) print_num("immr_base", bd->bi_immr_base); #endif print_num("bootflags", bd->bi_bootflags); -#if defined(CONFIG_405EP) || \ - defined(CONFIG_405GP) || \ - defined(CONFIG_440EP) || defined(CONFIG_440EPX) || \ - defined(CONFIG_440GR) || defined(CONFIG_440GRX) || \ - defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \ - defined(CONFIG_XILINX_405) - print_mhz("procfreq", bd->bi_procfreq); - print_mhz("plb_busfreq", bd->bi_plb_busfreq); -#if defined(CONFIG_405EP) || defined(CONFIG_405GP) || \ - defined(CONFIG_440EP) || defined(CONFIG_440EPX) || \ - defined(CONFIG_440GR) || defined(CONFIG_440GRX) || \ - defined(CONFIG_440SPE) || defined(CONFIG_XILINX_405) - print_mhz("pci_busfreq", bd->bi_pci_busfreq); -#endif -#else /* ! CONFIG_405GP, CONFIG_405EP, CONFIG_XILINX_405, CONFIG_440EP CONFIG_440GR */ #if defined(CONFIG_CPM2) print_mhz("vco", bd->bi_vco); print_mhz("sccfreq", bd->bi_sccfreq); @@ -215,7 +194,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_mhz("cpmfreq", bd->bi_cpmfreq); #endif print_mhz("busfreq", bd->bi_busfreq); -#endif /* CONFIG_405GP, CONFIG_405EP, CONFIG_XILINX_405, CONFIG_440EP CONFIG_440GR */ #ifdef CONFIG_ENABLE_36BIT_PHYS #ifdef CONFIG_PHYS_64BIT @@ -277,36 +255,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(); - print_baudrate(); - return 0; -} - #elif defined(CONFIG_M68K) int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -338,24 +286,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) 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_std_bdinfo(bd); - - return 0; -} - #elif defined(CONFIG_MIPS) int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -367,14 +297,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; } -#elif defined(CONFIG_AVR32) - -int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - print_std_bdinfo(gd->bd); - return 0; -} - #elif defined(CONFIG_ARM) static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, @@ -426,6 +348,8 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, printf("Early malloc usage: %lx / %x\n", gd->malloc_ptr, CONFIG_SYS_MALLOC_F_LEN); #endif + if (gd->fdt_blob) + printf("fdt_blob = %p\n", gd->fdt_blob); return 0; } @@ -493,20 +417,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; } -#elif defined(CONFIG_OPENRISC) - -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(); - print_baudrate(); - - return 0; -} - #elif defined(CONFIG_ARC) int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])