summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2016-11-16 17:49:19 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2017-01-11 15:15:48 +0100
commit2f84345d37c1fcf0c787e6b3c51438c782199cb6 (patch)
tree701ee9c6d6d7b01336c4d9965c3c928ef3c92f37 /common
parent29e0cfb4f77f7aa369136302cee14a91e22dca71 (diff)
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 <marcel.ziswiler@toradex.com> Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 62e7a5c5f85c8dd37500571da9607ef68203af12)
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 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;