From dbeeacb878b1b11c8d1df35f8a5db2b6ccf69c7b Mon Sep 17 00:00:00 2001
From: Anup Patel <anup.patel@wdc.com>
Date: Thu, 17 Sep 2020 15:51:00 +0530
Subject: [PATCH] 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@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Alistair Francis <alistair.francis@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 80871486..f51e36a2 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 64131948..55a04da7 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);