X-Git-Url: https://git.librecmc.org/?p=oweals%2Fu-boot.git;a=blobdiff_plain;f=common%2Fboard_info.c;h=a392bece62c695aa25b4235d5974532fd5bc72d8;hp=42d0641294a86c0c632213dd8a1ed52e96bbd7be;hb=b77d0292ca9f3ca69259dca7e2c5e193a403b289;hpb=e72d344386bf80738fab7a6bd37cb321f443093a

diff --git a/common/board_info.c b/common/board_info.c
index 42d0641294..a392bece62 100644
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -1,23 +1,19 @@
-/*
- * SPDX-License-Identifier:	GPL-2.0+
- */
+// SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 #include <linux/compiler.h>
 
 int __weak checkboard(void)
 {
-	printf("Board: Unknown\n");
 	return 0;
 }
 
 /*
  * If the root node of the DTB has a "model" property, show it.
- * If CONFIG_OF_CONTROL is disabled or the "model" property is missing,
- * fall back to checkboard().
+ * Then call checkboard().
  */
-int show_board_info(void)
+int __weak show_board_info(void)
 {
 #ifdef CONFIG_OF_CONTROL
 	DECLARE_GLOBAL_DATA_PTR;
@@ -25,10 +21,8 @@ int show_board_info(void)
 
 	model = fdt_getprop(gd->fdt_blob, 0, "model", NULL);
 
-	if (model) {
+	if (model)
 		printf("Model: %s\n", model);
-		return 0;
-	}
 #endif
 
 	return checkboard();