Re: [PATCH v1 1/2] image: Fix typo in boot_get_kbd()

2021-11-05 Thread Simon Glass
On Fri, 5 Nov 2021 at 14:10, Andy Shevchenko
 wrote:
>
> After the commit 4ed37abc49c2 ("image: Remove ifdefs around
> image_setup_linux() el at"):
>
> common/image-board.c: In function ‘boot_get_kbd’:
> common/image-board.c:902:17: error: expected ‘)’ before ‘do_bdinfo’
>   902 | do_bdinfo(NULL, 0, 0, NULL);
>   | ^
> common/image-board.c:901:12: note: to match this ‘(’
>   901 | if (IS_ENABLED(CONFIG_CMD_BDI)
>   |^
> common/image-board.c:906:1: error: expected expression before ‘}’ token
>   906 | }
>   | ^
> common/image-board.c:906:1: warning: control reaches end of non-void function 
> [-Wreturn-type]
>   906 | }
>   | ^
>
> Fix obvious typo.
>
> Fixes: 4ed37abc49c2 ("image: Remove ifdefs around image_setup_linux() el at")
> Signed-off-by: Andy Shevchenko 
>
> Revert "image: Partially revert too aggressive ifdeferry removal"
>
> This reverts commit 84631af9d0454ff8252c1aebb1e9c232b8077692.
>
> Signed-off-by: Andy Shevchenko 
> ---
>  common/image-board.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass 


[PATCH v1 1/2] image: Fix typo in boot_get_kbd()

2021-11-05 Thread Andy Shevchenko
After the commit 4ed37abc49c2 ("image: Remove ifdefs around
image_setup_linux() el at"):

common/image-board.c: In function ‘boot_get_kbd’:
common/image-board.c:902:17: error: expected ‘)’ before ‘do_bdinfo’
  902 | do_bdinfo(NULL, 0, 0, NULL);
  | ^
common/image-board.c:901:12: note: to match this ‘(’
  901 | if (IS_ENABLED(CONFIG_CMD_BDI)
  |^
common/image-board.c:906:1: error: expected expression before ‘}’ token
  906 | }
  | ^
common/image-board.c:906:1: warning: control reaches end of non-void function 
[-Wreturn-type]
  906 | }
  | ^

Fix obvious typo.

Fixes: 4ed37abc49c2 ("image: Remove ifdefs around image_setup_linux() el at")
Signed-off-by: Andy Shevchenko 

Revert "image: Partially revert too aggressive ifdeferry removal"

This reverts commit 84631af9d0454ff8252c1aebb1e9c232b8077692.

Signed-off-by: Andy Shevchenko 
---
 common/image-board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/image-board.c b/common/image-board.c
index e7660352e96a..ddf30c67302e 100644
--- a/common/image-board.c
+++ b/common/image-board.c
@@ -898,7 +898,7 @@ int boot_get_kbd(struct lmb *lmb, struct bd_info **kbd)
debug("## kernel board info at 0x%08lx\n", (ulong)*kbd);
 
 #if defined(DEBUG)
-   if (IS_ENABLED(CONFIG_CMD_BDI)
+   if (IS_ENABLED(CONFIG_CMD_BDI))
do_bdinfo(NULL, 0, 0, NULL);
 #endif
 
-- 
2.33.0