From 1a1b1cc2b4b1e94e38d5cf100ba02895fbc0fcd5 Mon Sep 17 00:00:00 2001
From: zhuyanlin <zhuyanlin1@xiaomi.com>
Date: Thu, 12 Aug 2021 14:50:02 +0800
Subject: [PATCH] arch:xtensa: replace include file from src/chip_xxx to chip.h

Use chip.h as a standard include file, replace chip_xxx in src dir
---
 arch/xtensa/src/common/xtensa_checkstack.c   | 2 +-
 arch/xtensa/src/common/xtensa_dumpstate.c    | 3 +--
 arch/xtensa/src/common/xtensa_initialize.c   | 2 +-
 arch/xtensa/src/common/xtensa_int_handlers.S | 4 ++--
 arch/xtensa/src/common/xtensa_panic.S        | 2 +-
 arch/xtensa/src/common/xtensa_user_handler.S | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/arch/xtensa/src/common/xtensa_checkstack.c b/arch/xtensa/src/common/xtensa_checkstack.c
index 2e2a4347d7..dbfe602e6f 100644
--- a/arch/xtensa/src/common/xtensa_checkstack.c
+++ b/arch/xtensa/src/common/xtensa_checkstack.c
@@ -33,9 +33,9 @@
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 
+#include "chip.h"
 #include "xtensa.h"
 #include "sched/sched.h"
-#include "chip_macros.h"
 
 #ifdef CONFIG_STACK_COLORATION
 
diff --git a/arch/xtensa/src/common/xtensa_dumpstate.c b/arch/xtensa/src/common/xtensa_dumpstate.c
index 9ca34a7ab0..fc93f9c061 100644
--- a/arch/xtensa/src/common/xtensa_dumpstate.c
+++ b/arch/xtensa/src/common/xtensa_dumpstate.c
@@ -35,10 +35,9 @@
 #include <arch/xtensa/xtensa_corebits.h>
 #include <arch/board/board.h>
 #include <arch/chip/core-isa.h>
+#include "chip.h"
 #include "sched/sched.h"
 #include "xtensa.h"
-#include "chip_memory.h"
-#include "chip_macros.h"
 
 #ifdef CONFIG_DEBUG_ALERT
 
diff --git a/arch/xtensa/src/common/xtensa_initialize.c b/arch/xtensa/src/common/xtensa_initialize.c
index a098d96365..de33c4c67e 100644
--- a/arch/xtensa/src/common/xtensa_initialize.c
+++ b/arch/xtensa/src/common/xtensa_initialize.c
@@ -42,7 +42,7 @@
 #include <arch/board/board.h>
 
 #include "xtensa.h"
-#include "chip_macros.h"
+#include "chip.h"
 
 /****************************************************************************
  * Private Functions
diff --git a/arch/xtensa/src/common/xtensa_int_handlers.S b/arch/xtensa/src/common/xtensa_int_handlers.S
index dbdde24de8..fa58841e98 100644
--- a/arch/xtensa/src/common/xtensa_int_handlers.S
+++ b/arch/xtensa/src/common/xtensa_int_handlers.S
@@ -63,9 +63,9 @@
 #include <arch/chip/core-isa.h>
 #include <arch/xtensa/xtensa_specregs.h>
 
+#include "chip.h"
 #include "xtensa.h"
 #include "xtensa_abi.h"
-#include "chip_macros.h"
 #include "xtensa_timer.h"
 
 #if !defined(CONFIG_SMP) && CONFIG_ARCH_INTERRUPTSTACK > 15
@@ -209,7 +209,7 @@ g_intstacktop:
   or a0, a0, a4               /* set top 2 bits */
   addx2 a0, a4, a0            /* clear top bit -- simulating call4 size   */
 #endif
-  
+
 	/* Call xtensa_int_decode passing the address of the register save area
 	 * as a parameter (A7).
 	 */
diff --git a/arch/xtensa/src/common/xtensa_panic.S b/arch/xtensa/src/common/xtensa_panic.S
index 4df58f8e98..172c49af5c 100644
--- a/arch/xtensa/src/common/xtensa_panic.S
+++ b/arch/xtensa/src/common/xtensa_panic.S
@@ -64,7 +64,7 @@
 #include <arch/xtensa/core.h>
 #include <arch/xtensa/xtensa_specregs.h>
 
-#include "chip_macros.h"
+#include "chip.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/xtensa/src/common/xtensa_user_handler.S b/arch/xtensa/src/common/xtensa_user_handler.S
index e7b470a513..7c6a7cdab1 100644
--- a/arch/xtensa/src/common/xtensa_user_handler.S
+++ b/arch/xtensa/src/common/xtensa_user_handler.S
@@ -64,7 +64,7 @@
 #include <arch/xtensa/core.h>
 #include <arch/xtensa/xtensa_specregs.h>
 
-#include "chip_macros.h"
+#include "chip.h"
 
 /****************************************************************************
  * Assembly Language Macros