From 43b0b48de7ab4c14ba64063e6097c76a76358440 Mon Sep 17 00:00:00 2001
From: Daniel Leung <daniel.leung@intel.com>
Date: Wed, 6 Dec 2023 15:09:23 -0800
Subject: [PATCH] xtensa: move files under core/include/ into include/

Header files under arch/xtensa/include are considered internal
to architecture. There is really no need for two places to
house architecture internal header files.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
---
 arch/xtensa/core/CMakeLists.txt                   | 2 --
 arch/xtensa/{core => }/include/xtensa_backtrace.h | 0
 arch/xtensa/{core => }/include/xtensa_mmu_priv.h  | 0
 soc/xtensa/dc233c/mmu.c                           | 2 +-
 4 files changed, 1 insertion(+), 3 deletions(-)
 rename arch/xtensa/{core => }/include/xtensa_backtrace.h (100%)
 rename arch/xtensa/{core => }/include/xtensa_mmu_priv.h (100%)

diff --git a/arch/xtensa/core/CMakeLists.txt b/arch/xtensa/core/CMakeLists.txt
index 0de05a13a25..ed430f2d0c4 100644
--- a/arch/xtensa/core/CMakeLists.txt
+++ b/arch/xtensa/core/CMakeLists.txt
@@ -37,8 +37,6 @@ if("${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "xcc")
   zephyr_library_sources(xcc_stubs.c)
 endif()
 
-zephyr_library_include_directories(include)
-
 add_subdirectory(startup)
 
 # This produces a preprocessed and regenerated (in the sense of gcc
diff --git a/arch/xtensa/core/include/xtensa_backtrace.h b/arch/xtensa/include/xtensa_backtrace.h
similarity index 100%
rename from arch/xtensa/core/include/xtensa_backtrace.h
rename to arch/xtensa/include/xtensa_backtrace.h
diff --git a/arch/xtensa/core/include/xtensa_mmu_priv.h b/arch/xtensa/include/xtensa_mmu_priv.h
similarity index 100%
rename from arch/xtensa/core/include/xtensa_mmu_priv.h
rename to arch/xtensa/include/xtensa_mmu_priv.h
diff --git a/soc/xtensa/dc233c/mmu.c b/soc/xtensa/dc233c/mmu.c
index 8decc952bf2..62c2c4b7f85 100644
--- a/soc/xtensa/dc233c/mmu.c
+++ b/soc/xtensa/dc233c/mmu.c
@@ -12,7 +12,7 @@
 #include <zephyr/arch/xtensa/xtensa_mmu.h>
 #include <zephyr/sys/util.h>
 
-#include "../../arch/xtensa/core/include/xtensa_mmu_priv.h"
+#include <xtensa_mmu_priv.h>
 
 const struct xtensa_mmu_range xtensa_soc_mmu_ranges[] = {
 	{