diff mbox

[U-Boot,v4,1/7] Revert "generic-board: allow showing custom board info"

Message ID 1478525794-20867-2-git-send-email-marcel.ziswiler@toradex.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Marcel Ziswiler Nov. 7, 2016, 1:36 p.m. UTC 
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>

---

Changes in v4: None
Changes in v3:
- introduce new patch dropping unused CONFIG_CUSTOM_BOARDINFO by
  reverting commit a9ad18c9d5fe2554753b0f9a52adfd5ebce61147

Changes in v2: None

 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 bd5dcfa..6afe98e 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;