From 106061b307d4f39780b7ac7765b03610235899ac Mon Sep 17 00:00:00 2001
From: Daniel Leung <daniel.leung@intel.com>
Date: Wed, 6 Dec 2023 13:42:05 -0800
Subject: [PATCH] xtensa: rename files with hyphens to underscores

Simply to provide some consistencies on file naming under
arch/xtensa.

These are all internally used files and are not public.
So there is no need to provide a deprecation path for
them.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
---
 arch/xtensa/core/CMakeLists.txt                             | 4 ++--
 arch/xtensa/core/{README-MMU.txt => README_MMU.txt}         | 0
 arch/xtensa/core/{README-WINDOWS.rst => README_WINDOWS.rst} | 0
 arch/xtensa/core/coredump.c                                 | 2 +-
 arch/xtensa/core/debug_helpers_asm.S                        | 2 +-
 arch/xtensa/core/gdbstub.c                                  | 2 +-
 arch/xtensa/core/offsets/offsets.c                          | 2 +-
 arch/xtensa/core/startup/CMakeLists.txt                     | 4 ++--
 .../core/startup/{memerror-vector.S => memerror_vector.S}   | 0
 arch/xtensa/core/startup/{reset-vector.S => reset_vector.S} | 0
 arch/xtensa/core/userspace.S                                | 2 +-
 arch/xtensa/core/{xtensa-asm2.c => xtensa_asm2.c}           | 2 +-
 arch/xtensa/core/{xtensa-asm2-util.S => xtensa_asm2_util.S} | 2 +-
 .../{xtensa-asm2-context.h => xtensa_asm2_context.h}        | 0
 arch/xtensa/include/{xtensa-asm2-s.h => xtensa_asm2_s.h}    | 2 +-
 soc/xtensa/dc233c/include/xtensa-dc233c.ld                  | 6 +++---
 soc/xtensa/espressif_esp32/esp32/gdbstub.c                  | 2 +-
 17 files changed, 16 insertions(+), 16 deletions(-)
 rename arch/xtensa/core/{README-MMU.txt => README_MMU.txt} (100%)
 rename arch/xtensa/core/{README-WINDOWS.rst => README_WINDOWS.rst} (100%)
 rename arch/xtensa/core/startup/{memerror-vector.S => memerror_vector.S} (100%)
 rename arch/xtensa/core/startup/{reset-vector.S => reset_vector.S} (100%)
 rename arch/xtensa/core/{xtensa-asm2.c => xtensa_asm2.c} (99%)
 rename arch/xtensa/core/{xtensa-asm2-util.S => xtensa_asm2_util.S} (99%)
 rename arch/xtensa/include/{xtensa-asm2-context.h => xtensa_asm2_context.h} (100%)
 rename arch/xtensa/include/{xtensa-asm2-s.h => xtensa_asm2_s.h} (99%)

diff --git a/arch/xtensa/core/CMakeLists.txt b/arch/xtensa/core/CMakeLists.txt
index b415aec2e9c..5ec158871dd 100644
--- a/arch/xtensa/core/CMakeLists.txt
+++ b/arch/xtensa/core/CMakeLists.txt
@@ -8,8 +8,8 @@ zephyr_library_sources(
   cpu_idle.c
   fatal.c
   window_vectors.S
-  xtensa-asm2-util.S
-  xtensa-asm2.c
+  xtensa_asm2_util.S
+  xtensa_asm2.c
   irq_manage.c
   )
 
diff --git a/arch/xtensa/core/README-MMU.txt b/arch/xtensa/core/README_MMU.txt
similarity index 100%
rename from arch/xtensa/core/README-MMU.txt
rename to arch/xtensa/core/README_MMU.txt
diff --git a/arch/xtensa/core/README-WINDOWS.rst b/arch/xtensa/core/README_WINDOWS.rst
similarity index 100%
rename from arch/xtensa/core/README-WINDOWS.rst
rename to arch/xtensa/core/README_WINDOWS.rst
diff --git a/arch/xtensa/core/coredump.c b/arch/xtensa/core/coredump.c
index d0a17eaa5a1..a2eec620774 100644
--- a/arch/xtensa/core/coredump.c
+++ b/arch/xtensa/core/coredump.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <zephyr/debug/coredump.h>
-#include <xtensa-asm2-context.h>
+#include <xtensa_asm2_context.h>
 #include <offsets.h>
 
 #define ARCH_HDR_VER			1
diff --git a/arch/xtensa/core/debug_helpers_asm.S b/arch/xtensa/core/debug_helpers_asm.S
index 8d895ba39dd..ea4df50daeb 100644
--- a/arch/xtensa/core/debug_helpers_asm.S
+++ b/arch/xtensa/core/debug_helpers_asm.S
@@ -8,7 +8,7 @@
 #include <xtensa/corebits.h>
 #include <xtensa/config/system.h>
 #include <xtensa/hal.h>
-#include <xtensa-asm2-context.h>
+#include <xtensa_asm2_context.h>
 
 #include <offsets.h>
 
diff --git a/arch/xtensa/core/gdbstub.c b/arch/xtensa/core/gdbstub.c
index 034b3532866..f3214250f7b 100644
--- a/arch/xtensa/core/gdbstub.c
+++ b/arch/xtensa/core/gdbstub.c
@@ -9,7 +9,7 @@
 #include <zephyr/toolchain.h>
 #include <zephyr/debug/gdbstub.h>
 
-#include <xtensa-asm2-context.h>
+#include <xtensa_asm2_context.h>
 #include <xtensa/corebits.h>
 
 static bool not_first_break;
diff --git a/arch/xtensa/core/offsets/offsets.c b/arch/xtensa/core/offsets/offsets.c
index 8d4022fd81e..8fca6962d3d 100644
--- a/arch/xtensa/core/offsets/offsets.c
+++ b/arch/xtensa/core/offsets/offsets.c
@@ -7,7 +7,7 @@
 #include <kernel_offsets.h>
 #include <zephyr/arch/xtensa/thread.h>
 
-#include <xtensa-asm2-context.h>
+#include <xtensa_asm2_context.h>
 
 GEN_ABSOLUTE_SYM(___xtensa_irq_bsa_t_SIZEOF, sizeof(_xtensa_irq_bsa_t));
 GEN_ABSOLUTE_SYM(___xtensa_irq_stack_frame_raw_t_SIZEOF, sizeof(_xtensa_irq_stack_frame_raw_t));
diff --git a/arch/xtensa/core/startup/CMakeLists.txt b/arch/xtensa/core/startup/CMakeLists.txt
index de30172ced2..fc17c5cd990 100644
--- a/arch/xtensa/core/startup/CMakeLists.txt
+++ b/arch/xtensa/core/startup/CMakeLists.txt
@@ -10,8 +10,8 @@ if(CONFIG_XTENSA_RESET_VECTOR)
     )
 
   zephyr_library_sources(
-    memerror-vector.S
+    memerror_vector.S
     memctl_default.S
-    reset-vector.S
+    reset_vector.S
     )
 endif()
diff --git a/arch/xtensa/core/startup/memerror-vector.S b/arch/xtensa/core/startup/memerror_vector.S
similarity index 100%
rename from arch/xtensa/core/startup/memerror-vector.S
rename to arch/xtensa/core/startup/memerror_vector.S
diff --git a/arch/xtensa/core/startup/reset-vector.S b/arch/xtensa/core/startup/reset_vector.S
similarity index 100%
rename from arch/xtensa/core/startup/reset-vector.S
rename to arch/xtensa/core/startup/reset_vector.S
diff --git a/arch/xtensa/core/userspace.S b/arch/xtensa/core/userspace.S
index 1a000d75d57..eff55dec46b 100644
--- a/arch/xtensa/core/userspace.S
+++ b/arch/xtensa/core/userspace.S
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <xtensa-asm2-s.h>
+#include <xtensa_asm2_s.h>
 #include <offsets.h>
 #include <offsets_short.h>
 #include <zephyr/syscall.h>
diff --git a/arch/xtensa/core/xtensa-asm2.c b/arch/xtensa/core/xtensa_asm2.c
similarity index 99%
rename from arch/xtensa/core/xtensa-asm2.c
rename to arch/xtensa/core/xtensa_asm2.c
index 288dfb8175f..d77302b731f 100644
--- a/arch/xtensa/core/xtensa-asm2.c
+++ b/arch/xtensa/core/xtensa_asm2.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <string.h>
-#include <xtensa-asm2-context.h>
+#include <xtensa_asm2_context.h>
 #include <zephyr/kernel.h>
 #include <ksched.h>
 #include <zephyr/kernel_structs.h>
diff --git a/arch/xtensa/core/xtensa-asm2-util.S b/arch/xtensa/core/xtensa_asm2_util.S
similarity index 99%
rename from arch/xtensa/core/xtensa-asm2-util.S
rename to arch/xtensa/core/xtensa_asm2_util.S
index 4f8af894ccb..f47f211057d 100644
--- a/arch/xtensa/core/xtensa-asm2-util.S
+++ b/arch/xtensa/core/xtensa_asm2_util.S
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <xtensa-asm2-s.h>
+#include <xtensa_asm2_s.h>
 #include <offsets.h>
 #include <zsr.h>
 
diff --git a/arch/xtensa/include/xtensa-asm2-context.h b/arch/xtensa/include/xtensa_asm2_context.h
similarity index 100%
rename from arch/xtensa/include/xtensa-asm2-context.h
rename to arch/xtensa/include/xtensa_asm2_context.h
diff --git a/arch/xtensa/include/xtensa-asm2-s.h b/arch/xtensa/include/xtensa_asm2_s.h
similarity index 99%
rename from arch/xtensa/include/xtensa-asm2-s.h
rename to arch/xtensa/include/xtensa_asm2_s.h
index 416a83453a2..5cbb1d8247c 100644
--- a/arch/xtensa/include/xtensa-asm2-s.h
+++ b/arch/xtensa/include/xtensa_asm2_s.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_S_H
 
 #include <zsr.h>
-#include "xtensa-asm2-context.h"
+#include "xtensa_asm2_context.h"
 
 #include <offsets.h>
 
diff --git a/soc/xtensa/dc233c/include/xtensa-dc233c.ld b/soc/xtensa/dc233c/include/xtensa-dc233c.ld
index 9c120e1b9d8..54701b37ee7 100644
--- a/soc/xtensa/dc233c/include/xtensa-dc233c.ld
+++ b/soc/xtensa/dc233c/include/xtensa-dc233c.ld
@@ -304,14 +304,14 @@ SECTIONS
      *       TLB multi-hit exception.
      */
 
-    *libarch__xtensa__core.a:xtensa-asm2-util.S.obj(.literal .text)
-    *libarch__xtensa__core.a:xtensa-asm2-util.S.obj(.iram.text .iram0.text)
+    *libarch__xtensa__core.a:xtensa_asm2_util.S.obj(.literal .text)
+    *libarch__xtensa__core.a:xtensa_asm2_util.S.obj(.iram.text .iram0.text)
 
     *libarch__xtensa__core.a:window_vectors.S.obj(.iram.text)
 
     *libarch__xtensa__core.a:crt1.S.obj(.literal .text)
 
-    LIB_OBJ_FUNC_IN_SECT(libarch__xtensa__core.a,xtensa-asm2.c.obj,*)
+    LIB_OBJ_FUNC_IN_SECT(libarch__xtensa__core.a,xtensa_asm2.c.obj,*)
     LIB_OBJ_FUNC_IN_SECT(libarch__xtensa__core.a,fatal.c.obj,*)
     LIB_OBJ_FUNC_IN_SECT(libarch__xtensa__core.a,cpu_idle.c.obj,*)
 
diff --git a/soc/xtensa/espressif_esp32/esp32/gdbstub.c b/soc/xtensa/espressif_esp32/esp32/gdbstub.c
index f7962b61851..c8913b7f5a2 100644
--- a/soc/xtensa/espressif_esp32/esp32/gdbstub.c
+++ b/soc/xtensa/espressif_esp32/esp32/gdbstub.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/kernel.h>
-#include <xtensa-asm2-context.h>
+#include <xtensa_asm2_context.h>
 #include <zephyr/debug/gdbstub.h>
 #include <offsets.h>