summaryrefslogtreecommitdiff
path: root/common/board_info.c
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2016-11-16 17:49:19 +0100
committerTom Rini <trini@konsulko.com>2016-11-28 15:10:32 -0500
commit62e7a5c5f85c8dd37500571da9607ef68203af12 (patch)
tree12b92bea09b43fd4d4c6b2562f678d5d2258fd04 /common/board_info.c
parentf069ded611a4740b9be5dc433f667b136306c53f (diff)
downloadu-boot-62e7a5c5f85c8dd37500571da9607ef68203af12.tar.gz
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>
Diffstat (limited to 'common/board_info.c')
-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;