[PATCH v5 39/43] command: Include a required header in command.h

[Mattijs Korpershoek]

On mer., sept. 27, 2023 at 08:22, Simon Glass <sjg at chromium.org> wrote:

> This uses ARRAY_SIZE() but does not include the header file which declares
> it. Fix this, so that command.h can be included without common.h
>
> Signed-off-by: Simon Glass <sjg at chromium.org>

Reviewed-by: Mattijs Korpershoek <mkorpershoek at baylibre.com>

> ---
>
> Changes in v5:
> - Adjust so this builds on azure
>
>  boot/bootm.c      | 2 +-
>  include/command.h | 4 ++++
>  2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/boot/bootm.c b/boot/bootm.c
> index b1c3afe0a3a..8f96a80d425 100644
> --- a/boot/bootm.c
> +++ b/boot/bootm.c
> @@ -8,6 +8,7 @@
>  #include <common.h>
>  #include <bootstage.h>
>  #include <cli.h>
> +#include <command.h>
>  #include <cpu_func.h>
>  #include <env.h>
>  #include <errno.h>
> @@ -29,7 +30,6 @@
>  #include "mkimage.h"
>  #endif
>  
> -#include <command.h>
>  #include <bootm.h>
>  #include <image.h>
>  
> diff --git a/include/command.h b/include/command.h
> index ae7bb4a30b0..34ea989b39b 100644
> --- a/include/command.h
> +++ b/include/command.h
> @@ -25,6 +25,10 @@
>  #endif
>  
>  #ifndef	__ASSEMBLY__
> +
> +/* For ARRAY_SIZE() */
> +#include <linux/kernel.h>
> +
>  /*
>   * Monitor Command Table
>   */
> -- 
> 2.42.0.515.g380fc7ccd1-goog