aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2021-07-04 21:32:05 +0200
committerTom Rini <trini@konsulko.com>2021-07-14 16:48:00 -0400
commit93e310c3a69984aa7e0435994da86c349d2d69d4 (patch)
treee5960ebfcca97bd5f3efb51d5e19423d7c3969cc /common
parent10f3e157e8f9d95860033fcaec2953f8cf11d2d6 (diff)
downloadu-boot-93e310c3a69984aa7e0435994da86c349d2d69d4.zip
u-boot-93e310c3a69984aa7e0435994da86c349d2d69d4.tar.gz
u-boot-93e310c3a69984aa7e0435994da86c349d2d69d4.tar.bz2
board-info: Call sysinfo_detect() before sysinfo_get_str()
The sysinfo_get_str() implementation checks whether the sysinfo was even detected. In U-Boot proper, sysinfo_detect() is not called anywhere but on one specific board. Call sysinfo_detect() before sysinfo_get_str() to make sure the sysinfo is detected and sysinfo_get_str() returns valid value instead of -EPERM. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com> Cc: Simon Glass <sjg@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/board_info.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/common/board_info.c b/common/board_info.c
index 89a29c3..e0f2d93 100644
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -32,10 +32,14 @@ int __weak show_board_info(void)
if (IS_ENABLED(CONFIG_SYSINFO)) {
/* This might provide more detail */
ret = sysinfo_get(&dev);
- if (!ret)
- ret = sysinfo_get_str(dev,
+ if (!ret) {
+ ret = sysinfo_detect(dev);
+ if (!ret) {
+ ret = sysinfo_get_str(dev,
SYSINFO_ID_BOARD_MODEL,
sizeof(str), str);
+ }
+ }
}
/* Fail back to the main 'model' if available */