summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-04-18 02:06:52 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-04-18 02:06:52 +0200
commit0cbb261a06969d71f16b3c32c9acbb1ef3168672 (patch)
treecac6d6b98ba10da712651f2b678f0dfc19518787 /common
parent6cf98c835543bdc146a940318e2047c63f2234c8 (diff)
generic-board: allow showing custom board info
Allow showing custom board info from a checkboard() function being implemented if CONFIG_CUSTOM_BOARDINFO is specified.
Diffstat (limited to 'common')
-rw-r--r--common/board_info.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/board_info.c b/common/board_info.c
index 42d0641294..a692f74904 100644
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -19,7 +19,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;