diff mbox

[U-Boot,v3,3/8] generic-board: allow showing custom board info

Message ID c9d5edf9c84671e717e70bdc335ffe95d8a1e5a9.1438636040.git.marcel.ziswiler@toradex.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Marcel Ziswiler Aug. 3, 2015, 9:15 p.m. UTC 
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

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>
---
Changes in v2: reword commit message as requested by Simon

 common/board_info.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --git a/common/board_info.c b/common/board_info.c
index 4e5a1f7..839fa5a 100644
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -18,7 +18,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;