Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / common / board_info.c

diff --git a/common/board_info.c b/common/board_info.c
index 6afe98edeee936ebf4313cfdcad1e11def5a8934..a392bece62c695aa25b4235d5974532fd5bc72d8 100644 (file)
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -1,9 +1,7 @@
-/*
- * 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)
@@ -15,7 +13,7 @@ int __weak checkboard(void)
  * If the root node of the DTB has a "model" property, show it.
  * Then call checkboard().
  */
-int show_board_info(void)
+int __weak show_board_info(void)
 {
 #ifdef CONFIG_OF_CONTROL
        DECLARE_GLOBAL_DATA_PTR;