From 580d17cc02db481c3a8e8006398a73d7d2cdd603 Mon Sep 17 00:00:00 2001
From: zhuyanlin <zhuyanlin1@xiaomi.com>
Date: Thu, 28 Oct 2021 20:22:09 +0800
Subject: [PATCH] arch:xtensa: make xtensa_abi.h global include and usage

N/A

Signed-off-by: zhuyanlin <zhuyanlin1@xiaomi.com>
---
 arch/xtensa/{src/common => include/xtensa}/xtensa_abi.h | 0
 arch/xtensa/src/common/xtensa_context.S                 | 3 +--
 arch/xtensa/src/common/xtensa_coproc.S                  | 3 +--
 arch/xtensa/src/common/xtensa_cpuint.S                  | 2 +-
 arch/xtensa/src/common/xtensa_int_handlers.S            | 2 +-
 arch/xtensa/src/common/xtensa_loadstore.S               | 2 +-
 arch/xtensa/src/common/xtensa_sigtramp.S                | 2 +-
 arch/xtensa/src/common/xtensa_simcall.S                 | 2 +-
 arch/xtensa/src/common/xtensa_vectors.S                 | 2 +-
 arch/xtensa/src/common/xtensa_windowspill.S             | 3 +--
 arch/xtensa/src/esp32/esp32_cpuindex.S                  | 2 +-
 11 files changed, 10 insertions(+), 13 deletions(-)
 rename arch/xtensa/{src/common => include/xtensa}/xtensa_abi.h (100%)

diff --git a/arch/xtensa/src/common/xtensa_abi.h b/arch/xtensa/include/xtensa/xtensa_abi.h
similarity index 100%
rename from arch/xtensa/src/common/xtensa_abi.h
rename to arch/xtensa/include/xtensa/xtensa_abi.h
diff --git a/arch/xtensa/src/common/xtensa_context.S b/arch/xtensa/src/common/xtensa_context.S
index 3ac5b77f819..08c13fb8164 100644
--- a/arch/xtensa/src/common/xtensa_context.S
+++ b/arch/xtensa/src/common/xtensa_context.S
@@ -63,10 +63,9 @@
 #include <arch/irq.h>
 #include <arch/chip/core-isa.h>
 #include <arch/chip/tie.h>
+#include <arch/xtensa/xtensa_abi.h>
 #include <arch/xtensa/xtensa_specregs.h>
 
-#include "xtensa_abi.h"
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/arch/xtensa/src/common/xtensa_coproc.S b/arch/xtensa/src/common/xtensa_coproc.S
index 3b2b6bfe24a..0090004f12f 100644
--- a/arch/xtensa/src/common/xtensa_coproc.S
+++ b/arch/xtensa/src/common/xtensa_coproc.S
@@ -40,14 +40,13 @@
 #include <nuttx/config.h>
 
 #include <arch/xtensa/core.h>
+#include <arch/xtensa/xtensa_abi.h>
 #include <arch/xtensa/xtensa_coproc.h>
 #include <arch/xtensa/xtensa_specregs.h>
 #include <arch/chip/core-isa.h>
 #include <arch/chip/tie.h>
 #include <arch/chip/tie-asm.h>
 
-#include "xtensa_abi.h"
-
 #if XCHAL_CP_NUM > 0
 
 /****************************************************************************
diff --git a/arch/xtensa/src/common/xtensa_cpuint.S b/arch/xtensa/src/common/xtensa_cpuint.S
index f8754998c25..da60961b841 100644
--- a/arch/xtensa/src/common/xtensa_cpuint.S
+++ b/arch/xtensa/src/common/xtensa_cpuint.S
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 #include <arch/chip/core-isa.h>
 
-#include "xtensa_abi.h"
+#include <arch/xtensa/xtensa_abi.h>
 
 #if XCHAL_HAVE_INTERRUPTS
 
diff --git a/arch/xtensa/src/common/xtensa_int_handlers.S b/arch/xtensa/src/common/xtensa_int_handlers.S
index 522c9692ad2..458cb784008 100644
--- a/arch/xtensa/src/common/xtensa_int_handlers.S
+++ b/arch/xtensa/src/common/xtensa_int_handlers.S
@@ -61,11 +61,11 @@
 
 #include <arch/irq.h>
 #include <arch/chip/core-isa.h>
+#include <arch/xtensa/xtensa_abi.h>
 #include <arch/xtensa/xtensa_specregs.h>
 
 #include "chip.h"
 #include "xtensa.h"
-#include "xtensa_abi.h"
 #include "xtensa_timer.h"
 
 #if !defined(CONFIG_SMP) && CONFIG_ARCH_INTERRUPTSTACK > 15
diff --git a/arch/xtensa/src/common/xtensa_loadstore.S b/arch/xtensa/src/common/xtensa_loadstore.S
index b14fdfef94f..d979b4b9186 100644
--- a/arch/xtensa/src/common/xtensa_loadstore.S
+++ b/arch/xtensa/src/common/xtensa_loadstore.S
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "xtensa_abi.h"
+#include <arch/xtensa/xtensa_abi.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/xtensa/src/common/xtensa_sigtramp.S b/arch/xtensa/src/common/xtensa_sigtramp.S
index 9feebd75aec..6a1d3306f21 100644
--- a/arch/xtensa/src/common/xtensa_sigtramp.S
+++ b/arch/xtensa/src/common/xtensa_sigtramp.S
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 
-#include "xtensa_abi.h"
+#include <arch/xtensa/xtensa_abi.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/xtensa/src/common/xtensa_simcall.S b/arch/xtensa/src/common/xtensa_simcall.S
index 8361db405a6..76828569d52 100644
--- a/arch/xtensa/src/common/xtensa_simcall.S
+++ b/arch/xtensa/src/common/xtensa_simcall.S
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "xtensa_abi.h"
+#include <arch/xtensa/xtensa_abi.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/xtensa/src/common/xtensa_vectors.S b/arch/xtensa/src/common/xtensa_vectors.S
index fd0a6627532..8f1e893f403 100644
--- a/arch/xtensa/src/common/xtensa_vectors.S
+++ b/arch/xtensa/src/common/xtensa_vectors.S
@@ -40,10 +40,10 @@
 
 #include <arch/irq.h>
 #include <arch/chip/core-isa.h>
+#include <arch/xtensa/xtensa_abi.h>
 #include <arch/xtensa/xtensa_specregs.h>
 
 #include "xtensa.h"
-#include "xtensa_abi.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/xtensa/src/common/xtensa_windowspill.S b/arch/xtensa/src/common/xtensa_windowspill.S
index f2d3448be5d..76dc81e67db 100644
--- a/arch/xtensa/src/common/xtensa_windowspill.S
+++ b/arch/xtensa/src/common/xtensa_windowspill.S
@@ -41,11 +41,10 @@
 
 #include <arch/chip/core-isa.h>
 #include <arch/xtensa/core.h>
+#include <arch/xtensa/xtensa_abi.h>
 #include <arch/xtensa/xtensa_specregs.h>
 #include <arch/xtensa/xtensa_corebits.h>
 
-#include "xtensa_abi.h"
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/arch/xtensa/src/esp32/esp32_cpuindex.S b/arch/xtensa/src/esp32/esp32_cpuindex.S
index 981fd3bbad4..6951ba7d692 100644
--- a/arch/xtensa/src/esp32/esp32_cpuindex.S
+++ b/arch/xtensa/src/esp32/esp32_cpuindex.S
@@ -24,7 +24,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "xtensa_abi.h"
+#include <arch/xtensa/xtensa_abi.h>
 #include "chip_macros.h"
 
 /****************************************************************************