include: arch: arm: Remove aarch32 directory

This commit follows the parent commit work.

This commit introduces the following major changes.

  1. Move all directories and files in 'include/zephyr/arch/arm/aarch32'
    to the 'include/zephyr/arch/arm' directory.

  2. Change the path string which is influenced by the changement 1.

Signed-off-by: Huifeng Zhang <[email protected]>

Author: SgrrZhf

CODEOWNERS

@@ -655,11 +655,11 @@
 /include/zephyr/arch/arc/                        @abrodkin @ruuddw @evgeniy-paltsev
 /include/zephyr/arch/arc/arch.h                  @abrodkin @ruuddw @evgeniy-paltsev
 /include/zephyr/arch/arc/v2/irq.h                @abrodkin @ruuddw @evgeniy-paltsev
-/include/zephyr/arch/arm/aarch32/                @MaureenHelm @galak @ioannisg
-/include/zephyr/arch/arm/aarch32/cortex_a_r/     @stephanosio
+/include/zephyr/arch/arm                         @MaureenHelm @galak @ioannisg
+/include/zephyr/arch/arm/cortex_a_r/             @stephanosio
 /include/zephyr/arch/arm64/                      @carlocaione
 /include/zephyr/arch/arm64/cortex_r/             @povergoing
-/include/zephyr/arch/arm/aarch32/irq.h           @carlocaione
+/include/zephyr/arch/arm/irq.h                   @carlocaione
 /include/zephyr/arch/mips/                       @frantony
 /include/zephyr/arch/nios2/                      @nashif
 /include/zephyr/arch/nios2/arch.h                @nashif

MAINTAINERS.yml

@@ -141,7 +141,6 @@ ARM arch:
   files:
     - arch/arm/
     - arch/arm/core/offsets/
-    - include/zephyr/arch/arm/aarch32/
     - include/zephyr/arch/arm/
     - tests/arch/arm/
     - doc/hardware/arch/arm_cortex_m.rst

arch/arm/core/cortex_m/fpu.c

@@ -7,7 +7,7 @@
 
 #include <zephyr/kernel.h>
 #include <cmsis_core.h>
-#include <zephyr/arch/arm/aarch32/cortex_m/fpu.h>
+#include <zephyr/arch/arm/cortex_m/fpu.h>
 
 /**
  * @file @brief Helper functions for saving and restoring the FP context.

arch/arm/core/mmu/arm_mmu.c

@@ -31,7 +31,7 @@
 
 #include <cmsis_core.h>
 
-#include <zephyr/arch/arm/aarch32/mmu/arm_mmu.h>
+#include <zephyr/arch/arm/mmu/arm_mmu.h>
 #include "arm_mmu_priv.h"
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);

arch/arm/core/prep_c.c

@@ -22,7 +22,7 @@
 #include <zephyr/sys/barrier.h>
 
 #if !defined(CONFIG_CPU_CORTEX_M)
-#include <zephyr/arch/arm/aarch32/cortex_a_r/lib_helpers.h>
+#include <zephyr/arch/arm/cortex_a_r/lib_helpers.h>
 #endif
 
 #if defined(CONFIG_ARMV7_R) || defined(CONFIG_ARMV7_A)

arch/arm/core/swap_helper.S

@@ -22,7 +22,7 @@
 #include <zephyr/kernel.h>
 
 #if defined(CONFIG_CPU_CORTEX_M)
-#include <zephyr/arch/arm/aarch32/cortex_m/cpu.h>
+#include <zephyr/arch/arm/cortex_m/cpu.h>
 #endif
 _ASM_FILE_PROLOGUE
 

arch/arm/core/userspace.S

@@ -12,7 +12,7 @@
 #include <offsets_short.h>
 #include <zephyr/syscall.h>
 
-#include <zephyr/arch/arm/aarch32/exc.h>
+#include <zephyr/arch/arm/exc.h>
 
 #if defined(CONFIG_CPU_AARCH32_CORTEX_R)
 #include <zephyr/arch/cpu.h>

arch/arm/include/cortex_m/exc.h

@@ -23,7 +23,7 @@
 #else
 
 #include <cmsis_core.h>
-#include <zephyr/arch/arm/aarch32/exc.h>
+#include <zephyr/arch/arm/exc.h>
 #include <zephyr/irq_offload.h>
 
 #ifdef __cplusplus

boards/arm/ip_k66f/linker.ld

@@ -44,4 +44,4 @@ ITERABLE_SECTION_RAM(net_if_dev, 4)                             \
 ITERABLE_SECTION_RAM(net_l2, 4)                                 \
 ITERABLE_SECTION_RAM(eth_bridge, 4)
 
-#include <zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld>
+#include <zephyr/arch/arm/cortex_m/scripts/linker.ld>