mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-27 22:56:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

sysinfo: Allow displaying more info on startup

Browse Source 
At present only the model name is shown on start. Some boards want to
display more information. Add some more options to allow display of the
manufacturer as well as the version and date of any prior-stage
firmware.

This is useful for coreboot, at least. If other boards have more
information to display, it is easy to add it, now.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-11-12 19:58:28 -07:00 committed by Tom Rini
parent d2a1b432a8
commit 6f646d13f4
3 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
common/board_info.c
View File

@ -15,35 +15,65 @@ int __weak checkboard(void)
return 0;
}
static const struct to_show {
const char *name;
enum sysinfo_id id;
} to_show[] = {
{ "Manufacturer", SYSINFO_ID_BOARD_MANUFACTURER},
{ "Prior-stage version", SYSINFO_ID_PRIOR_STAGE_VERSION },
{ "Prior-stage date", SYSINFO_ID_PRIOR_STAGE_DATE },
{ /* sentinel */ }
};
static int try_sysinfo(void)
{
struct udevice *dev;
char str[80];
int ret;
/* This might provide more detail */
ret = sysinfo_get(&dev);
if (ret)
return ret;
ret = sysinfo_detect(dev);
if (ret)
return ret;
ret = sysinfo_get_str(dev, SYSINFO_ID_BOARD_MODEL, sizeof(str), str);
if (ret)
return ret;
printf("Model: %s\n", str);
if (IS_ENABLED(CONFIG_SYSINFO_EXTRA)) {
const struct to_show *item;
for (item = to_show; item->id; item++) {
ret = sysinfo_get_str(dev, item->id, sizeof(str), str);
if (!ret)
printf("%s: %s\n", item->name, str);
}
}
return 0;
}
int show_board_info(void)
{
if (IS_ENABLED(CONFIG_OF_CONTROL)) {
struct udevice *dev;
const char *model;
char str[80];
int ret = -ENOSYS;
if (IS_ENABLED(CONFIG_SYSINFO)) {
/* This might provide more detail */
ret = sysinfo_get(&dev);
if (!ret) {
ret = sysinfo_detect(dev);
if (!ret) {
ret = sysinfo_get_str(dev,
SYSINFO_ID_BOARD_MODEL,
sizeof(str), str);
}
}
}
if (IS_ENABLED(CONFIG_SYSINFO))
ret = try_sysinfo();
/* Fail back to the main 'model' if available */
if (ret)
model = fdt_getprop(gd->fdt_blob, 0, "model", NULL);
else
model = str;
if (ret) {
const char *model;
if (model)
printf("Model: %s\n", model);
model = fdt_getprop(gd->fdt_blob, 0, "model", NULL);
if (model)
printf("Model: %s\n", model);
}
}
return checkboard();

7
drivers/sysinfo/Kconfig
View File

@ -8,6 +8,13 @@ menuconfig SYSINFO
if SYSINFO
config SYSINFO_EXTRA
bool "Show extra information on startup"
help
Enable this to see extra information on startup. Normally only the
model is shown, but with this option the vendor and any prior-stage
firmware's version and date are shown as well.
config SPL_SYSINFO
depends on SPL_DM
bool "Enable board driver support in SPL"

3
include/sysinfo.h
View File

@ -46,6 +46,9 @@ enum sysinfo_id {
/* For show_board_info() */
SYSINFO_ID_BOARD_MODEL,
SYSINFO_ID_BOARD_MANUFACTURER,
SYSINFO_ID_PRIOR_STAGE_VERSION,
SYSINFO_ID_PRIOR_STAGE_DATE,
/* First value available for downstream/board used */
SYSINFO_ID_USER = 0x1000,