diff mbox

[U-Boot,v2] tools: fix env_flags build

Message ID 1455477204-17984-1-git-send-email-lkundrak@v3.sk
State Accepted
Commit ed0f40a673c42b4174ccb34e3c6d7b46cd90b701
Delegated to: Tom Rini
Headers show

Commit Message

Lubomir Rintel Feb. 14, 2016, 7:13 p.m. UTC
$ make tools-all
  ...
  In file included from tools/env/env_flags.c:1:0:
  tools/env/../../common/env_flags.c: In function
    ‘env_flags_parse_varaccess_from_binflags’:
    tools/env/../../common/env_flags.c:156:18: warning: implicit declaration
    of function ‘ARRAY_SIZE’ [-Wimplicit-function-declaration]
      for (i = 0; i < ARRAY_SIZE(env_flags_varaccess_mask); i++)
                      ^
Seems like the other utilities just add a copy of ARRAY_SIZE since
there's nowhere to include it from (tools/imagetool.h,
tools/mxsimage.h). Let's do the same here.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
Changes since v1:
  - Moved from tools/env/env_flags.c to common/env_flags.c
    as per suggestion from Tom Rini

 common/env_flags.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Tom Rini Feb. 15, 2016, 10:35 p.m. UTC | #1
On Sun, Feb 14, 2016 at 08:13:24PM +0100, Lubomir Rintel wrote:

> $ make tools-all
>   ...
>   In file included from tools/env/env_flags.c:1:0:
>   tools/env/../../common/env_flags.c: In function
>     ‘env_flags_parse_varaccess_from_binflags’:
>     tools/env/../../common/env_flags.c:156:18: warning: implicit declaration
>     of function ‘ARRAY_SIZE’ [-Wimplicit-function-declaration]
>       for (i = 0; i < ARRAY_SIZE(env_flags_varaccess_mask); i++)
>                       ^
> Seems like the other utilities just add a copy of ARRAY_SIZE since
> there's nowhere to include it from (tools/imagetool.h,
> tools/mxsimage.h). Let's do the same here.
> 
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/common/env_flags.c b/common/env_flags.c
index 735bba5..921d377 100644
--- a/common/env_flags.c
+++ b/common/env_flags.c
@@ -15,6 +15,7 @@ 
 #include <env_attr.h>
 #include <env_flags.h>
 #define getenv fw_getenv
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #else
 #include <common.h>
 #include <environment.h>