[PATCH v4 01/16] include: sbi: Remove redundant includes from sbi_platform.h

[Anup Patel]

> -----Original Message-----
> From: Anup Patel <Anup.Patel at wdc.com>
> Sent: 20 October 2020 15:09
> To: Atish Patra <Atish.Patra at wdc.com>; Alistair Francis
> <Alistair.Francis at wdc.com>
> Cc: Anup Patel <anup at brainfault.org>; opensbi at lists.infradead.org; Anup
> Patel <Anup.Patel at wdc.com>; Alistair Francis <Alistair.Francis at wdc.com>
> Subject: [PATCH v4 01/16] include: sbi: Remove redundant includes from
> sbi_platform.h
> 
> The sbi_ecall.h and sbi_trap.h are not required to be included in
> sbi_platform.h hence we remove it. This way sources requiring these
> headers will have to explicitly include it thereby reducing implicit includes.
> 
> Signed-off-by: Anup Patel <anup.patel at wdc.com>
> Reviewed-by: Atish Patra <atish.patra at wdc.com>
> Reviewed-by: Alistair Francis <alistair.francis at wdc.com>
> ---
>  include/sbi/sbi_platform.h | 4 ++--
>  lib/sbi/sbi_hart.c         | 1 +
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/include/sbi/sbi_platform.h b/include/sbi/sbi_platform.h index
> 8087148..f51e36a 100644
> --- a/include/sbi/sbi_platform.h
> +++ b/include/sbi/sbi_platform.h
> @@ -40,12 +40,12 @@
> 
>  #ifndef __ASSEMBLY__
> 
> -#include <sbi/sbi_ecall.h>
>  #include <sbi/sbi_error.h>
>  #include <sbi/sbi_scratch.h>
> -#include <sbi/sbi_trap.h>
>  #include <sbi/sbi_version.h>
> 
> +struct sbi_trap_info;
> +
>  /** Possible feature flags of a platform */  enum sbi_platform_features {
>  	/** Platform has timer value */
> diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index 6413194..55a04da
> 100644
> --- a/lib/sbi/sbi_hart.c
> +++ b/lib/sbi/sbi_hart.c
> @@ -19,6 +19,7 @@
>  #include <sbi/sbi_math.h>
>  #include <sbi/sbi_platform.h>
>  #include <sbi/sbi_string.h>
> +#include <sbi/sbi_trap.h>
> 
>  extern void __sbi_expected_trap(void);
>  extern void __sbi_expected_trap_hext(void);
> --
> 2.25.1

Applied this patch to the riscv/opensbi repo

Regards,
Anup