Merge branch '2023-01-20-finish-CONFIG-migration-work'

[platform/kernel/u-boot.git] / common / board_info.c

diff --git a/common/board_info.c b/common/board_info.c
index 1cfe34f..e0f2d93 100644 (file)
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -31,11 +31,15 @@ int __weak show_board_info(void)
 
                if (IS_ENABLED(CONFIG_SYSINFO)) {
                        /* This might provide more detail */
-                       ret = uclass_first_device_err(UCLASS_SYSINFO, &dev);
-                       if (!ret)
-                               ret = sysinfo_get_str(dev,
+                       ret = sysinfo_get(&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 */