X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fboard_info.c;h=16cf966233eda77b37f0dc02d9dae5dfd93991af;hb=7b3b74d321279b8aaee448d136fa9d20f8fd0739;hp=42d0641294a86c0c632213dd8a1ed52e96bbd7be;hpb=307367eaffc8638e10ba1784fc66bfe623ae79e2;p=u-boot

diff --git a/common/board_info.c b/common/board_info.c
index 42d0641294..16cf966233 100644
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -3,21 +3,19 @@
  */
 
 #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 +23,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();