From 48fbbbbc65ef2aa8ffc57fed0356ed1fb7260aca Mon Sep 17 00:00:00 2001
From: Gerson Fernando Budke <nandojve@gmail.com>
Date: Wed, 13 Oct 2021 20:02:26 -0300
Subject: [PATCH] [feat][zephyr] Drop arch includes at blx02.h files

This move riscv specific includes to source files that require the
definitions. It drop all arch files dependencies at blX02.h file.

Signed-off-by: Gerson Fernando Budke <nandojve@gmail.com>
---
 drivers/bl602_driver/hal_drv/src/hal_mtimer.c |  1 +
 drivers/bl602_driver/regs/bl602.h             | 20 -------------------
 drivers/bl602_driver/startup/interrupt.c      |  2 ++
 drivers/bl602_driver/startup/system_bl602.c   |  1 +
 drivers/bl702_driver/hal_drv/src/hal_mtimer.c |  1 +
 drivers/bl702_driver/regs/bl702.h             | 16 ---------------
 drivers/bl702_driver/startup/interrupt.c      |  2 ++
 drivers/bl702_driver/startup/system_bl702.c   |  1 +
 8 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/drivers/bl602_driver/hal_drv/src/hal_mtimer.c b/drivers/bl602_driver/hal_drv/src/hal_mtimer.c
index c8c2c2b6..00229134 100644
--- a/drivers/bl602_driver/hal_drv/src/hal_mtimer.c
+++ b/drivers/bl602_driver/hal_drv/src/hal_mtimer.c
@@ -22,6 +22,7 @@
  */
 #include "hal_mtimer.h"
 #include "bl602_glb.h"
+#include "risc-v/Core/Include/clic.h"
 
 static void (*systick_callback)(void);
 static uint64_t next_compare_tick = 0;
diff --git a/drivers/bl602_driver/regs/bl602.h b/drivers/bl602_driver/regs/bl602.h
index dbee0c66..66f1bd5c 100644
--- a/drivers/bl602_driver/regs/bl602.h
+++ b/drivers/bl602_driver/regs/bl602.h
@@ -247,25 +247,5 @@ typedef enum {
   */
 #include <stdint.h>
 #include <system_bl602.h>
-/* ARM CPU include files */
-#ifdef ARCH_ARM
-#ifdef CPU_AP_CM4
-#include "core_cm4.h" /* Cortex-M4 processor and core peripherals */
-#endif
-#ifdef CPU_NP_CM0
-#include "core_cm0.h" /* Cortex-M0 processor and core peripherals */
-#endif
-#endif
-/* RISCV CPU include files */
-#ifdef ARCH_RISCV
-#ifdef __GNUC__
-#include "../risc-v/Core/Include/clic.h"
-#include "../risc-v/Core/Include/riscv_encoding.h"
-#endif
-#endif
-
-/**
-  * @}
-  */
 
 #endif
diff --git a/drivers/bl602_driver/startup/interrupt.c b/drivers/bl602_driver/startup/interrupt.c
index 038156f9..e7ea186b 100644
--- a/drivers/bl602_driver/startup/interrupt.c
+++ b/drivers/bl602_driver/startup/interrupt.c
@@ -22,6 +22,8 @@
  */
 #include "bl602_common.h"
 #include "bflb_platform.h"
+#include "risc-v/Core/Include/clic.h"
+#include "risc-v/Core/Include/riscv_encoding.h"
 
 pFunc __Interrupt_Handlers[IRQn_LAST] = { 0 };
 
diff --git a/drivers/bl602_driver/startup/system_bl602.c b/drivers/bl602_driver/startup/system_bl602.c
index d3d737e2..c9136bc3 100644
--- a/drivers/bl602_driver/startup/system_bl602.c
+++ b/drivers/bl602_driver/startup/system_bl602.c
@@ -1,6 +1,7 @@
 #include "bl602.h"
 #include "bl602_glb.h"
 #include "bl602_hbn.h"
+#include "risc-v/Core/Include/clic.h"
 
 /*----------------------------------------------------------------------------
   Define clocks
diff --git a/drivers/bl702_driver/hal_drv/src/hal_mtimer.c b/drivers/bl702_driver/hal_drv/src/hal_mtimer.c
index a243e20f..2305305e 100644
--- a/drivers/bl702_driver/hal_drv/src/hal_mtimer.c
+++ b/drivers/bl702_driver/hal_drv/src/hal_mtimer.c
@@ -22,6 +22,7 @@
  */
 #include "hal_mtimer.h"
 #include "bl702_glb.h"
+#include "risc-v/Core/Include/clic.h"
 
 static void (*systick_callback)(void);
 static uint64_t next_compare_tick = 0;
diff --git a/drivers/bl702_driver/regs/bl702.h b/drivers/bl702_driver/regs/bl702.h
index d70233d3..47ae5e55 100644
--- a/drivers/bl702_driver/regs/bl702.h
+++ b/drivers/bl702_driver/regs/bl702.h
@@ -299,22 +299,6 @@ typedef enum {
   */
 #include <stdint.h>
 #include <system_bl702.h>
-/* ARM CPU include files */
-#ifdef ARCH_ARM
-#ifdef CPU_AP_CM4
-#include "core_cm4.h" /* Cortex-M4 processor and core peripherals */
-#endif
-#ifdef CPU_NP_CM0
-#include "core_cm0.h" /* Cortex-M0 processor and core peripherals */
-#endif
-#endif
-/* RISCV CPU include files */
-#ifdef ARCH_RISCV
-#ifdef __GNUC__
-#include "../risc-v/Core/Include/clic.h"
-#include "../risc-v/Core/Include/riscv_encoding.h"
-#endif
-#endif
 
 /**
   * @}
diff --git a/drivers/bl702_driver/startup/interrupt.c b/drivers/bl702_driver/startup/interrupt.c
index 668ab92c..e23b18d2 100644
--- a/drivers/bl702_driver/startup/interrupt.c
+++ b/drivers/bl702_driver/startup/interrupt.c
@@ -22,6 +22,8 @@
  */
 #include "bl702_common.h"
 #include "bflb_platform.h"
+#include "risc-v/Core/Include/clic.h"
+#include "risc-v/Core/Include/riscv_encoding.h"
 
 pFunc __Interrupt_Handlers[IRQn_LAST] = { 0 };
 
diff --git a/drivers/bl702_driver/startup/system_bl702.c b/drivers/bl702_driver/startup/system_bl702.c
index d2d2568c..6b49791c 100644
--- a/drivers/bl702_driver/startup/system_bl702.c
+++ b/drivers/bl702_driver/startup/system_bl702.c
@@ -23,6 +23,7 @@
 #include "bl702.h"
 #include "bl702_glb.h"
 #include "bl702_hbn.h"
+#include "risc-v/Core/Include/clic.h"
 
 #ifdef BFLB_EFLASH_LOADER
 #include "bl702_usb.h"