Merge git://git.denx.de/u-boot-uniphier

[people/ms/u-boot.git] / common / board_info.c

diff --git a/common/board_info.c b/common/board_info.c
index bd5dcfa066358c2cc44ce5d19fcc3e77d555cd09..aa45e24b34603751c8e21cae4c631bd41eb54b1a 100644 (file)
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -15,9 +15,9 @@ 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)
 {
-#if defined(CONFIG_OF_CONTROL) && !defined(CONFIG_CUSTOM_BOARDINFO)
+#ifdef CONFIG_OF_CONTROL
        DECLARE_GLOBAL_DATA_PTR;
        const char *model;