diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-25 18:15:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-25 18:15:50 -0400 |
| commit | 04f005d552eb748582678a45119b55a99f75748e (patch) | |
| tree | d57377eec42fbfecfc3108d8b64b8061331fed3a /include | |
| parent | f0e236c8d6646f6ef0ebf8f043962a07dda3b3a3 (diff) | |
| parent | c68a1ae6ab760d797f4dde2c5c671e18d0e2adb4 (diff) | |
| download | u-boot-04f005d552eb748582678a45119b55a99f75748e.zip u-boot-04f005d552eb748582678a45119b55a99f75748e.tar.gz u-boot-04f005d552eb748582678a45119b55a99f75748e.tar.bz2 | |
Merge branch '2020-06-25-tidy-up-bd-command' into next
- Tidy up the 'bdinfo' command so that it's both consistent for all
architectures and sharing as much code as possible.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/u-boot.h | 18 | ||||
| -rw-r--r-- | include/init.h | 9 |
2 files changed, 9 insertions, 18 deletions
diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h index 6f74973..008ebf3 100644 --- a/include/asm-generic/u-boot.h +++ b/include/asm-generic/u-boot.h @@ -61,7 +61,6 @@ typedef struct bd_info { unsigned long bi_vco; /* VCO Out from PLL, in MHz */ #endif #if defined(CONFIG_M68K) - unsigned long bi_ipbfreq; /* IPB Bus Freq, in MHz */ unsigned long bi_pcifreq; /* PCI Bus Freq, in MHz */ #endif #if defined(CONFIG_EXTRA_CLOCK) @@ -69,23 +68,6 @@ typedef struct bd_info { unsigned long bi_vcofreq; /* vco Freq in MHz */ unsigned long bi_flbfreq; /* Flexbus Freq in MHz */ #endif - -#ifdef CONFIG_HAS_ETH1 - unsigned char bi_enet1addr[6]; /* OLD: see README.enetaddr */ -#endif -#ifdef CONFIG_HAS_ETH2 - unsigned char bi_enet2addr[6]; /* OLD: see README.enetaddr */ -#endif -#ifdef CONFIG_HAS_ETH3 - unsigned char bi_enet3addr[6]; /* OLD: see README.enetaddr */ -#endif -#ifdef CONFIG_HAS_ETH4 - unsigned char bi_enet4addr[6]; /* OLD: see README.enetaddr */ -#endif -#ifdef CONFIG_HAS_ETH5 - unsigned char bi_enet5addr[6]; /* OLD: see README.enetaddr */ -#endif - ulong bi_arch_number; /* unique id for this board */ ulong bi_boot_params; /* where this board expects params */ #ifdef CONFIG_NR_DRAM_BANKS diff --git a/include/init.h b/include/init.h index b5a167b..e727031 100644 --- a/include/init.h +++ b/include/init.h @@ -261,6 +261,15 @@ void relocate_code(ulong start_addr_sp, struct global_data *new_gd, __attribute__ ((noreturn)); #endif +/* Print a numeric value (for use in arch_print_bdinfo()) */ +void bdinfo_print_num(const char *name, ulong value); + +/* Print a clock speed in MHz */ +void bdinfo_print_mhz(const char *name, unsigned long hz); + +/* Show arch-specific information for the 'bd' command */ +void arch_print_bdinfo(void); + #endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */ |