From 62e7a5c5f85c8dd37500571da9607ef68203af12 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Wed, 16 Nov 2016 17:49:19 +0100 Subject: [PATCH] Revert "generic-board: allow showing custom board info" Drop CONFIG_CUSTOM_BOARDINFO as it is not Kconfig compliant and anyway not really used anywhere plus the upcoming weak show_board_info() approach seems much superior. This reverts commit a9ad18c9d5fe2554753b0f9a52adfd5ebce61147. Signed-off-by: Marcel Ziswiler Reviewed-by: Tom Rini Acked-by: Max Krummenacher --- 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 bd5dcfa066..6afe98edee 100644 --- a/common/board_info.c +++ b/common/board_info.c @@ -17,7 +17,7 @@ int __weak checkboard(void) */ int show_board_info(void) { -#if defined(CONFIG_OF_CONTROL) && !defined(CONFIG_CUSTOM_BOARDINFO) +#ifdef CONFIG_OF_CONTROL DECLARE_GLOBAL_DATA_PTR; const char *model; -- 2.25.1