[U-Boot] [PATCH v2 3/8] generic-board: allow showing custom board info

2015-07-08 Thread Marcel Ziswiler
From: Marcel Ziswiler marcel.ziswi...@toradex.com

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 marcel.ziswi...@toradex.com
---
Changes in v2: reword commit message as requested by Simon

 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 42d0641..a692f74 100644
--- a/common/board_info.c
+++ b/common/board_info.c
@@ -19,7 +19,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;
 
-- 
1.9.3

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH v2 3/8] generic-board: allow showing custom board info

2015-07-08 Thread Simon Glass
On 8 July 2015 at 05:58, Marcel Ziswiler mar...@ziswiler.com wrote:
 From: Marcel Ziswiler marcel.ziswi...@toradex.com

 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 marcel.ziswi...@toradex.com
 ---
 Changes in v2: reword commit message as requested by Simon

  common/board_info.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass s...@chromium.org
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot