generic-board: allow showing custom board info
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>
Wed, 5 Aug 2015 15:17:00 +0000 (17:17 +0200)
committerTom Rini <trini@konsulko.com>
Thu, 13 Aug 2015 11:19:36 +0000 (07:19 -0400)
Allow showing custom board info from a checkboard() function being
implemented if CONFIG_CUSTOM_BOARDINFO is specified.  Previously the
device tree model was always displayed not taking any
CONFIG_CUSTOM_BOARDINFO into account.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
common/board_info.c

index 6afe98edeee936ebf4313cfdcad1e11def5a8934..bd5dcfa066358c2cc44ce5d19fcc3e77d555cd09 100644 (file)
@@ -17,7 +17,7 @@ int __weak checkboard(void)
  */
 int show_board_info(void)
 {
-#ifdef CONFIG_OF_CONTROL
+#if defined(CONFIG_OF_CONTROL) && !defined(CONFIG_CUSTOM_BOARDINFO)
        DECLARE_GLOBAL_DATA_PTR;
        const char *model;