From a9ad18c9d5fe2554753b0f9a52adfd5ebce61147 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Wed, 5 Aug 2015 17:17:00 +0200 Subject: [PATCH] generic-board: allow showing custom board info 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 Reviewed-by: Simon Glass --- common/board_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/board_info.c b/common/board_info.c index 6afe98edee..bd5dcfa066 100644 --- a/common/board_info.c +++ b/common/board_info.c @@ -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; -- 2.25.1