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>

doc/hardware/arch/arm_cortex_m.rst

@@ -8,7 +8,7 @@
 
 #include <stdint.h>
 
-#include <zephyr/arch/arm/aarch32/irq.h>
+#include <zephyr/arch/arm/irq.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/interrupt_controller/intc_vim.h>

doc/kernel/code-relocation.rst

@@ -12,7 +12,7 @@
 
 #include <errno.h>
 #include <soc.h>
-#include <zephyr/arch/arm/aarch32/nmi.h>
+#include <zephyr/arch/arm/nmi.h>
 #include <zephyr/drivers/watchdog.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/reboot.h>

doc/kernel/usermode/memory_domain.rst

@@ -5,7 +5,7 @@
  */
 
 #include <soc.h>
-#include <zephyr/arch/arm/aarch32/nmi.h>
+#include <zephyr/arch/arm/nmi.h>
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/watchdog.h>
 #include <zephyr/logging/log.h>

drivers/interrupt_controller/intc_vim.c

@@ -15,7 +15,7 @@
 #if defined(CONFIG_X86) || defined(CONFIG_X86_64)
 #include <zephyr/arch/x86/arch_inlines.h>
 #elif defined(CONFIG_ARM)
-#include <zephyr/arch/arm/aarch32/arch_inlines.h>
+#include <zephyr/arch/arm/arch_inlines.h>
 #elif defined(CONFIG_ARM64)
 #include <zephyr/arch/arm64/arch_inlines.h>
 #elif defined(CONFIG_ARC)

drivers/watchdog/wdt_cmsdk_apb.c

@@ -22,29 +22,29 @@
 /* ARM GPRs are often designated by two different names */
 #define sys_define_gpr_with_alias(name1, name2) union { uint32_t name1, name2; }
 
-#include <zephyr/arch/arm/aarch32/thread.h>
-#include <zephyr/arch/arm/aarch32/exc.h>
-#include <zephyr/arch/arm/aarch32/irq.h>
-#include <zephyr/arch/arm/aarch32/error.h>
-#include <zephyr/arch/arm/aarch32/misc.h>
+#include <zephyr/arch/arm/thread.h>
+#include <zephyr/arch/arm/exc.h>
+#include <zephyr/arch/arm/irq.h>
+#include <zephyr/arch/arm/error.h>
+#include <zephyr/arch/arm/misc.h>
 #include <zephyr/arch/common/addr_types.h>
 #include <zephyr/arch/common/ffs.h>
-#include <zephyr/arch/arm/aarch32/nmi.h>
-#include <zephyr/arch/arm/aarch32/asm_inline.h>
+#include <zephyr/arch/arm/nmi.h>
+#include <zephyr/arch/arm/asm_inline.h>
 #include <zephyr/arch/common/sys_bitops.h>
 
 #ifdef CONFIG_CPU_CORTEX_M
-#include <zephyr/arch/arm/aarch32/cortex_m/cpu.h>
-#include <zephyr/arch/arm/aarch32/cortex_m/memory_map.h>
+#include <zephyr/arch/arm/cortex_m/cpu.h>
+#include <zephyr/arch/arm/cortex_m/memory_map.h>
 #include <zephyr/arch/common/sys_io.h>
 #elif defined(CONFIG_CPU_AARCH32_CORTEX_R) || defined(CONFIG_CPU_AARCH32_CORTEX_A)
-#include <zephyr/arch/arm/aarch32/cortex_a_r/cpu.h>
-#include <zephyr/arch/arm/aarch32/cortex_a_r/sys_io.h>
+#include <zephyr/arch/arm/cortex_a_r/cpu.h>
+#include <zephyr/arch/arm/cortex_a_r/sys_io.h>
 #if defined(CONFIG_AARCH32_ARMV8_R)
-#include <zephyr/arch/arm/aarch32/cortex_a_r/lib_helpers.h>
-#include <zephyr/arch/arm/aarch32/cortex_a_r/armv8_timer.h>
+#include <zephyr/arch/arm/cortex_a_r/lib_helpers.h>
+#include <zephyr/arch/arm/cortex_a_r/armv8_timer.h>
 #else
-#include <zephyr/arch/arm/aarch32/cortex_a_r/timer.h>
+#include <zephyr/arch/arm/cortex_a_r/timer.h>
 #endif
 #endif
 
@@ -265,14 +265,14 @@ enum k_fatal_error_reason_arch {
 /* Legacy case: retain containing extern "C" with C++ */
 #ifdef CONFIG_ARM_MPU
 #ifdef CONFIG_CPU_HAS_ARM_MPU
-#include <zephyr/arch/arm/aarch32/mpu/arm_mpu.h>
+#include <zephyr/arch/arm/mpu/arm_mpu.h>
 #endif /* CONFIG_CPU_HAS_ARM_MPU */
 #ifdef CONFIG_CPU_HAS_NXP_MPU
-#include <zephyr/arch/arm/aarch32/mpu/nxp_mpu.h>
+#include <zephyr/arch/arm/mpu/nxp_mpu.h>
 #endif /* CONFIG_CPU_HAS_NXP_MPU */
 #endif /* CONFIG_ARM_MPU */
 #ifdef CONFIG_ARM_AARCH32_MMU
-#include <zephyr/arch/arm/aarch32/mmu/arm_mmu.h>
+#include <zephyr/arch/arm/mmu/arm_mmu.h>
 #endif /* CONFIG_ARM_AARCH32_MMU */
 
 #ifdef __cplusplus

drivers/watchdog/wdt_smartbond.c

@@ -15,7 +15,7 @@
  */
 
 #if defined(__GNUC__)
-#include <zephyr/arch/arm/aarch32/asm_inline_gcc.h>
+#include <zephyr/arch/arm/asm_inline_gcc.h>
 #else
 #include <arch/arm/asm_inline_other.h>
 #endif

include/zephyr/arch/arch_inlines.h

@@ -19,10 +19,10 @@
 #ifndef _ASMLANGUAGE
 
 #include <zephyr/types.h>
-#include <zephyr/arch/arm/aarch32/exc.h>
+#include <zephyr/arch/arm/exc.h>
 
 #if defined(CONFIG_CPU_AARCH32_CORTEX_R) || defined(CONFIG_CPU_AARCH32_CORTEX_A)
-#include <zephyr/arch/arm/aarch32/cortex_a_r/cpu.h>
+#include <zephyr/arch/arm/cortex_a_r/cpu.h>
 #endif
 
 #ifdef __cplusplus

include/zephyr/arch/arm/aarch32/arch.h renamed to include/zephyr/arch/arm/arch.h

@@ -8,7 +8,7 @@
 #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_CPU_H_
 
 #if defined(CONFIG_ARM_MPU)
-#include <zephyr/arch/arm/aarch32/cortex_a_r/mpu.h>
+#include <zephyr/arch/arm/cortex_a_r/mpu.h>
 #endif
 
 /*

include/zephyr/arch/arm/aarch32/arch_inlines.h renamed to include/zephyr/arch/arm/arch_inlines.h

@@ -6,7 +6,7 @@
 #ifndef _ARM_CORTEX_M_MPU_MEM_CFG_H_
 #define _ARM_CORTEX_M_MPU_MEM_CFG_H_
 
-#include <zephyr/arch/arm/aarch32/mpu/arm_mpu.h>
+#include <zephyr/arch/arm/mpu/arm_mpu.h>
 
 #if !defined(CONFIG_ARMV8_M_BASELINE) && !defined(CONFIG_ARMV8_M_MAINLINE)
 

include/zephyr/arch/arm/aarch32/asm_inline.h renamed to include/zephyr/arch/arm/asm_inline.h

@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/arch/arm/aarch32/cortex_a_r/scripts/linker.ld>
+#include <zephyr/arch/arm/cortex_a_r/scripts/linker.ld>

include/zephyr/arch/arm/aarch32/asm_inline_gcc.h renamed to include/zephyr/arch/arm/asm_inline_gcc.h

@@ -15,8 +15,8 @@
 #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_
 #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_
 
-#include <zephyr/arch/arm/aarch32/syscall.h>
-#include <zephyr/arch/arm/aarch32/exc.h>
+#include <zephyr/arch/arm/syscall.h>
+#include <zephyr/arch/arm/exc.h>
 #include <stdbool.h>
 
 #ifdef __cplusplus

include/zephyr/arch/arm/aarch32/barrier.h renamed to include/zephyr/arch/arm/barrier.h

@@ -18,7 +18,7 @@
 #if defined(CONFIG_CPU_CORTEX_M)
 #include <zephyr/devicetree.h>
 
-#include <zephyr/arch/arm/aarch32/cortex_m/nvic.h>
+#include <zephyr/arch/arm/cortex_m/nvic.h>
 
 /* for assembler, only works with constants */
 #define Z_EXC_PRIO(pri) (((pri) << (8 - NUM_IRQ_PRIO_BITS)) & 0xff)

include/zephyr/arch/arm/aarch32/cortex_a_r/armv8_timer.h renamed to include/zephyr/arch/arm/cortex_a_r/armv8_timer.h

@@ -11,12 +11,12 @@
 	defined(CONFIG_CPU_CORTEX_M4) || \
 	defined(CONFIG_CPU_CORTEX_M7) || \
 	defined(CONFIG_ARMV7_R)
-#include <zephyr/arch/arm/aarch32/mpu/arm_mpu_v7m.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_v7m.h>
 #elif defined(CONFIG_CPU_CORTEX_M23) || \
 	defined(CONFIG_CPU_CORTEX_M33) || \
 	defined(CONFIG_CPU_CORTEX_M55) || \
 	defined(CONFIG_AARCH32_ARMV8_R)
-#include <zephyr/arch/arm/aarch32/mpu/arm_mpu_v8.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_v8.h>
 #else
 #error "Unsupported ARM CPU"
 #endif

include/zephyr/arch/arm/aarch32/cortex_a_r/cmsis.h renamed to include/zephyr/arch/arm/cortex_a_r/cmsis.h

@@ -26,7 +26,7 @@
 
 #include <zephyr/types.h>
 #include <stdbool.h>
-#include <zephyr/arch/arm/aarch32/misc.h>
+#include <zephyr/arch/arm/misc.h>
 
 #ifdef __cplusplus
 extern "C" {

include/zephyr/arch/arm/aarch32/cortex_a_r/cpu.h renamed to include/zephyr/arch/arm/cortex_a_r/cpu.h

@@ -16,7 +16,7 @@
 #elif defined(CONFIG_ARM64)
 #include <zephyr/arch/arm64/arch.h>
 #elif defined(CONFIG_ARM)
-#include <zephyr/arch/arm/aarch32/arch.h>
+#include <zephyr/arch/arm/arch.h>
 #elif defined(CONFIG_ARC)
 #include <zephyr/arch/arc/arch.h>
 #elif defined(CONFIG_NIOS2)

include/zephyr/arch/arm/aarch32/cortex_a_r/lib_helpers.h renamed to include/zephyr/arch/arm/cortex_a_r/lib_helpers.h

@@ -18,7 +18,7 @@
 #elif defined(CONFIG_ARM64)
 #include <zephyr/arch/arm64/syscall.h>
 #elif defined(CONFIG_ARM)
-#include <zephyr/arch/arm/aarch32/syscall.h>
+#include <zephyr/arch/arm/syscall.h>
 #elif defined(CONFIG_ARC)
 #include <zephyr/arch/arc/syscall.h>
 #elif defined(CONFIG_RISCV)

include/zephyr/arch/arm/aarch32/cortex_a_r/mpu.h renamed to include/zephyr/arch/arm/cortex_a_r/mpu.h

@@ -11,7 +11,7 @@
 
 #if defined(CONFIG_BARRIER_OPERATIONS_ARCH)
 # if defined(CONFIG_ARM)
-# include <zephyr/arch/arm/aarch32/barrier.h>
+# include <zephyr/arch/arm/barrier.h>
 # elif defined(CONFIG_ARM64)
 # include <zephyr/arch/arm64/barrier.h>
 # endif

include/zephyr/arch/arm/aarch32/cortex_a_r/scripts/app_data_alignment.ld renamed to include/zephyr/arch/arm/cortex_a_r/scripts/app_data_alignment.ld

@@ -14,7 +14,7 @@
 #ifndef ZEPHYR_MODULES_CMSIS_CMSIS_M_H_
 #define ZEPHYR_MODULES_CMSIS_CMSIS_M_H_
 
-#include <zephyr/arch/arm/aarch32/cortex_m/nvic.h>
+#include <zephyr/arch/arm/cortex_m/nvic.h>
 
 #include <soc.h>
 

include/zephyr/arch/arm/aarch32/cortex_a_r/scripts/linker.ld renamed to include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld

@@ -8,7 +8,7 @@
 #include <zephyr/device.h>
 #include <zephyr/init.h>
 #include <zephyr/kernel.h>
-#include <zephyr/arch/arm/aarch32/cortex_m/fpu.h>
+#include <zephyr/arch/arm/cortex_m/fpu.h>
 
 #include <tfm_ns_interface.h>
 

include/zephyr/arch/arm/aarch32/cortex_a_r/sys_io.h renamed to include/zephyr/arch/arm/cortex_a_r/sys_io.h

@@ -44,4 +44,4 @@ MEMORY
 
 #endif /* CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP */
 
-#include <zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld>
+#include <zephyr/arch/arm/cortex_m/scripts/linker.ld>

include/zephyr/arch/arm/aarch32/cortex_a_r/timer.h renamed to include/zephyr/arch/arm/cortex_a_r/timer.h

@@ -8,7 +8,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/sys/printk.h>
 #include <cmsis_core.h>
-#include <zephyr/arch/arm/aarch32/exc.h>
+#include <zephyr/arch/arm/exc.h>
 
 #define LED0_NODE DT_ALIAS(led0)
 static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(LED0_NODE, gpios);

include/zephyr/arch/arm/aarch32/cortex_m/arm_mpu_mem_cfg.h renamed to include/zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h

@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld>
+#include <zephyr/arch/arm/cortex_m/scripts/linker.ld>

include/zephyr/arch/arm/aarch32/cortex_m/cmsis.h renamed to include/zephyr/arch/arm/cortex_m/cmsis.h

@@ -6,4 +6,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld>
+#include <zephyr/arch/arm/cortex_m/scripts/linker.ld>

include/zephyr/arch/arm/aarch32/cortex_m/cpu.h renamed to include/zephyr/arch/arm/cortex_m/cpu.h

@@ -6,4 +6,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld>
+#include <zephyr/arch/arm/cortex_m/scripts/linker.ld>

include/zephyr/arch/arm/aarch32/cortex_m/fpu.h renamed to include/zephyr/arch/arm/cortex_m/fpu.h

@@ -5,7 +5,7 @@
 
 #include <zephyr/sys/slist.h>
 #include <zephyr/linker/linker-defs.h>
-#include <zephyr/arch/arm/aarch32/mpu/arm_mpu.h>
+#include <zephyr/arch/arm/mpu/arm_mpu.h>
 
 #define DEVICE_REGION_START 0x80000000UL
 #define DEVICE_REGION_END   0xFFFFFFFFUL

include/zephyr/arch/arm/aarch32/cortex_m/memory_map.h renamed to include/zephyr/arch/arm/cortex_m/memory_map.h

@@ -5,4 +5,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/arch/arm/aarch32/cortex_a_r/scripts/linker.ld>
+#include <zephyr/arch/arm/cortex_a_r/scripts/linker.ld>