diff mbox

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

Message ID 6e757bd30e9d99ce23d1b457008d9cf73133d11c.1435791392.git.marcel.ziswiler@toradex.com
State Superseded
Headers show

Commit Message

Marcel Ziswiler July 1, 2015, 11:04 p.m. UTC 
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Allow showing custom board info from a checkboard() function being
implemented if CONFIG_CUSTOM_BOARDINFO is specified.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
 common/board_info.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Glass July 3, 2015, 3:27 a.m. UTC | #1 
Hi Marcel,

On 1 July 2015 at 17:04, Marcel Ziswiler <marcel@ziswiler.com> wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
>
> Allow showing custom board info from a checkboard() function being
> implemented if CONFIG_CUSTOM_BOARDINFO is specified.
>

Can you reword this? It seems confusing. From what I can tell you are
turning off the device tree model display if CONFIG_CUSTOM_BOARDINFO
is enabled.

> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
>  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
>

Regards,
Simon
diff mbox

Patch

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;