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

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

[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 <andriy.shevchenko@linux.intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
v2: added tag (Simon)
 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

[PATCH v2 2/2] image: Explicitly declare do_bdinfo()

[Andy Shevchenko]

Compiler is not happy:

common/image-board.c: In function ‘boot_get_kbd’:
common/image-board.c:902:17: warning: implicit declaration of function ‘do_bdinfo’ [-Wimplicit-function-declaration]
  902 |                 do_bdinfo(NULL, 0, 0, NULL);
      |                 ^~~~~~~~~

Move the forward declaration to a header.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: dropped ifdeffery and extern (Simon), included header to the users
 common/image-board.c | 1 +
 common/image.c       | 6 +-----
 include/init.h       | 2 ++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/image-board.c b/common/image-board.c
index ddf30c67302e..bf8817165cab 100644
--- a/common/image-board.c
+++ b/common/image-board.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <fpga.h>
 #include <image.h>
+#include <init.h>
 #include <mapmem.h>
 #include <rtc.h>
 #include <watchdog.h>
diff --git a/common/image.c b/common/image.c
index 3fa60b582796..5ef15c45d286 100644
--- a/common/image.c
+++ b/common/image.c
@@ -9,6 +9,7 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
@@ -29,11 +30,6 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 
-#ifdef CONFIG_CMD_BDI
-extern int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc,
-		     char *const argv[]);
-#endif
-
 DECLARE_GLOBAL_DATA_PTR;
 
 /* Set this if we have less than 4 MB of malloc() space */
diff --git a/include/init.h b/include/init.h
index c781789e367e..f2cd46dead04 100644
--- a/include/init.h
+++ b/include/init.h
@@ -332,6 +332,8 @@ void bdinfo_print_mhz(const char *name, unsigned long hz);
 /* Show arch-specific information for the 'bd' command */
 void arch_print_bdinfo(void);
 
+int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
+
 #endif	/* __ASSEMBLY__ */
 /* Put only stuff here that the assembler can digest */
 
-- 
2.33.0

Re: [PATCH v2 2/2] image: Explicitly declare do_bdinfo()

[Simon Glass]

On Mon, 8 Nov 2021 at 11:05, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> Compiler is not happy:
>
> common/image-board.c: In function ‘boot_get_kbd’:
> common/image-board.c:902:17: warning: implicit declaration of function ‘do_bdinfo’ [-Wimplicit-function-declaration]
>   902 |                 do_bdinfo(NULL, 0, 0, NULL);
>       |                 ^~~~~~~~~
>
> Move the forward declaration to a header.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> v2: dropped ifdeffery and extern (Simon), included header to the users
>  common/image-board.c | 1 +
>  common/image.c       | 6 +-----
>  include/init.h       | 2 ++
>  3 files changed, 4 insertions(+), 5 deletions(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH v2 2/2] image: Explicitly declare do_bdinfo()

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 591 bytes --]

On Mon, Nov 08, 2021 at 09:03:38PM +0300, Andy Shevchenko wrote:

> Compiler is not happy:
> 
> common/image-board.c: In function ‘boot_get_kbd’:
> common/image-board.c:902:17: warning: implicit declaration of function ‘do_bdinfo’ [-Wimplicit-function-declaration]
>   902 |                 do_bdinfo(NULL, 0, 0, NULL);
>       |                 ^~~~~~~~~
> 
> Move the forward declaration to a header.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

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

[Simon Glass]

On Mon, 8 Nov 2021 at 11:04, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> 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 <andriy.shevchenko@linux.intel.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
> v2: added tag (Simon)
>  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
>