arch: arm: aarch32: Rename cortex_r to cortex_a_r

This commit renames the `cortex_r` directory under the AArch32 to
`cortex_a_r`, in preparation for the AArch32 Cortex-A support.

The rationale for this renaming is that the Cortex-A and Cortex-R share
the same base design and the difference between them, other than the
MPU vs. MMU, is minimal.

Since most of the architecture port code and configurations will be
shared between the Cortex-A and Cortex-R architectures, it is
advantageous to have them together in the same directory.

Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

CODEOWNERS

@@ -22,7 +22,7 @@
 /arch/arm/core/aarch64/                   @carlocaione
 /arch/arm/include/aarch32/cortex_m/cmse.h @ioannisg
 /arch/arm/include/aarch64/                @carlocaione
-/arch/arm/core/aarch32/cortex_r/          @MaureenHelm @galak @ioannisg @bbolen @stephanosio
+/arch/arm/core/aarch32/cortex_a_r/        @MaureenHelm @galak @ioannisg @bbolen @stephanosio
 /arch/common/                             @andrewboie @ioannisg @andyross
 /soc/arc/snps_*/                          @vonhust @ruuddw
 /soc/nios2/                               @nashif @wentongwu
@@ -298,7 +298,7 @@
 /include/arch/arc/arch.h                  @andrewboie
 /include/arch/arc/v2/irq.h                @andrewboie
 /include/arch/arm/aarch32/                @MaureenHelm @galak @ioannisg
-/include/arch/arm/aarch32/cortex_r/       @stephanosio
+/include/arch/arm/aarch32/cortex_a_r/     @stephanosio
 /include/arch/arm/aarch64/                @carlocaione
 /include/arch/arm/aarch32/irq.h           @andrewboie
 /include/arch/nios2/                      @andrewboie

arch/arm/core/aarch32/CMakeLists.txt

@@ -32,6 +32,6 @@ add_subdirectory_ifdef(CONFIG_CPU_CORTEX_M_HAS_CMSE cortex_m/cmse)
 add_subdirectory_ifdef(CONFIG_ARM_SECURE_FIRMWARE cortex_m/tz)
 add_subdirectory_ifdef(CONFIG_ARM_NONSECURE_FIRMWARE cortex_m/tz)
 
-add_subdirectory_ifdef(CONFIG_CPU_CORTEX_R cortex_r)
+add_subdirectory_ifdef(CONFIG_CPU_CORTEX_R cortex_a_r)
 
 zephyr_linker_sources(ROM_START SORT_KEY 0x0vectors vector_table.ld)

arch/arm/core/aarch32/Kconfig

@@ -238,6 +238,6 @@ config FP_SOFTABI
 endchoice
 
 rsource "cortex_m/Kconfig"
-rsource "cortex_r/Kconfig"
+rsource "cortex_a_r/Kconfig"
 
 endif # !ARM64

arch/arm/core/aarch32/cortex_a_r/stacks.c

@@ -5,7 +5,7 @@
  */
 
 #include <kernel.h>
-#include <aarch32/cortex_r/stack.h>
+#include <aarch32/cortex_a_r/stack.h>
 #include <string.h>
 #include <kernel_internal.h>
 

arch/arm/core/aarch32/prep_c.c

@@ -21,7 +21,7 @@
 #include <linker/linker-defs.h>
 
 #if defined(CONFIG_ARMV7_R)
-#include <aarch32/cortex_r/stack.h>
+#include <aarch32/cortex_a_r/stack.h>
 #endif
 
 #if defined(__GNUC__)

arch/arm/include/aarch32/cortex_a_r/exc.h

@@ -6,13 +6,13 @@
 
 /**
  * @file
- * @brief Exception/interrupt context helpers for Cortex-R CPUs
+ * @brief Exception/interrupt context helpers for Cortex-A and Cortex-R CPUs
  *
  * Exception/interrupt context helpers.
  */
 
-#ifndef _ARM_CORTEXR_ISR__H_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_A_R_EXC_H_
-#define _ARM_CORTEXR_ISR__H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_A_R_EXC_H_
 
 #include <arch/cpu.h>
 
@@ -77,4 +77,4 @@ extern void z_arm_cortex_r_svc(void);
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _ARM_CORTEXRM_ISR__H_ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_A_R_EXC_H_ */

arch/arm/include/aarch32/cortex_a_r/stack.h

@@ -6,13 +6,13 @@
 
 /**
  * @file
- * @brief Stack helpers for Cortex-R CPUs
+ * @brief Stack helpers for Cortex-A and Cortex-R CPUs
  *
  * Stack helper functions.
  */
 
-#ifndef _ARM_CORTEXR_STACK__H_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_A_R_STACK_H_
-#define _ARM_CORTEXR_STACK__H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_A_R_STACK_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,4 +44,4 @@ static ALWAYS_INLINE void z_arm_interrupt_stack_setup(void)
 }
 #endif
 
-#endif /* _ARM_CORTEXR_STACK__H_ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_A_R_STACK_H_ */

arch/arm/include/cortex_r/exc.h

@@ -8,9 +8,9 @@
 #define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_EXC_H_
 
 #ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <aarch32/cortex_r/exc.h> instead."
+#warning "This header file has moved, include <aarch32/cortex_a_r/exc.h> instead."
 #endif
 
-#include <aarch32/cortex_r/exc.h>
+#include <aarch32/cortex_a_r/exc.h>
 
 #endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_EXC_H_ */

arch/arm/include/cortex_r/stack.h

@@ -8,9 +8,9 @@
 #define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_STACK_H_
 
 #ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <aarch32/cortex_r/stack.h> instead."
+#warning "This header file has moved, include <aarch32/cortex_a_r/stack.h> instead."
 #endif
 
-#include <aarch32/cortex_r/stack.h>
+#include <aarch32/cortex_a_r/stack.h>
 
 #endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_STACK_H_ */

include/arch/arm/aarch32/arch.h

@@ -37,8 +37,8 @@
 #include <arch/arm/aarch32/cortex_m/memory_map.h>
 #include <arch/common/sys_io.h>
 #elif defined(CONFIG_CPU_CORTEX_R)
-#include <arch/arm/aarch32/cortex_r/cpu.h>
+#include <arch/arm/aarch32/cortex_a_r/cpu.h>
-#include <arch/arm/aarch32/cortex_r/sys_io.h>
+#include <arch/arm/aarch32/cortex_a_r/sys_io.h>
 #endif
 
 #ifdef __cplusplus

include/arch/arm/aarch32/asm_inline_gcc.h

@@ -23,7 +23,7 @@
 #include <irq.h>
 
 #if defined(CONFIG_CPU_CORTEX_R)
-#include <arch/arm/cortex_r/cpu.h>
+#include <arch/arm/aarch32/cortex_a_r/cpu.h>
 #endif
 
 #ifdef __cplusplus

include/arch/arm/aarch32/cortex_a_r/cmsis.h

@@ -11,8 +11,8 @@
  * This header contains the interface to the ARM CMSIS Core headers.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CMSIS_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_CMSIS_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CMSIS_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_CMSIS_H_
 
 #include <soc.h>
 
@@ -37,7 +37,7 @@ extern "C" {
 #elif defined(CONFIG_CPU_CORTEX_R5)
 #include <core_cr5.h>
 #else
-#error "Unknown Cortex-R device"
+#error "Unknown device"
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CMSIS_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_CMSIS_H_ */

include/arch/arm/aarch32/cortex_a_r/cpu.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _CORTEX_R_CPU_H
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_CPU_H_
-#define _CORTEX_R_CPU_H
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_CPU_H_
 
 #define MODE_USR	0x10
 #define MODE_FIQ	0x11
@@ -31,4 +31,4 @@
 
 #define FPEXC_EN	(1 << 30)
 
-#endif
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_CPU_H_ */

include/arch/arm/aarch32/cortex_a_r/scripts/linker.ld

@@ -8,7 +8,7 @@
  * @file
  * @brief Linker command/script file
  *
- * Linker script for the Cortex-R platforms.
+ * Linker script for the Cortex-A and Cortex-R platforms.
  */
 
 #include <autoconf.h>

include/arch/arm/aarch32/cortex_a_r/sys_io.h

@@ -9,14 +9,14 @@
  * gcc builtins)
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_SYS_IO_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_SYS_IO_H_
 
 #ifndef _ASMLANGUAGE
 
 #include <zephyr/types.h>
 #include <sys/sys_io.h>
-#include <arch/arm/aarch32/cortex_r/cmsis.h>
+#include <arch/arm/aarch32/cortex_a_r/cmsis.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -160,4 +160,4 @@ static ALWAYS_INLINE
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_SYS_IO_H_ */

include/arch/arm/cortex_r/cpu.h

@@ -8,9 +8,9 @@
 #define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_CPU_H_
 
 #ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <arch/arm/aarch32/cortex_r/cpu.h> instead."
+#warning "This header file has moved, include <arch/arm/aarch32/cortex_a_r/cpu.h> instead."
 #endif
 
-#include <arch/arm/aarch32/cortex_r/cpu.h>
+#include <arch/arm/aarch32/cortex_a_r/cpu.h>
 
 #endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_CPU_H_ */

include/arch/arm/cortex_r/scripts/linker.ld

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

include/arch/arm/cortex_r/sys_io.h

@@ -8,9 +8,9 @@
 #define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_
 
 #ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <arch/arm/aarch32/cortex_r/sys_io.h> instead."
+#warning "This header file has moved, include <arch/arm/aarch32/cortex_a_r/sys_io.h> instead."
 #endif
 
-#include <arch/arm/aarch32/cortex_r/sys_io.h>
+#include <arch/arm/aarch32/cortex_a_r/sys_io.h>
 
 #endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_ */

soc/arm/xilinx_zynqmp/linker.ld

@@ -8,5 +8,5 @@
 #include <autoconf.h>
 
 #if defined(CONFIG_SOC_XILINX_ZYNQMP_RPU)
-#include <arch/arm/aarch32/cortex_r/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_a_r/scripts/linker.ld>
 #endif

soc/arm/xilinx_zynqmp/soc.c

@@ -8,7 +8,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <init.h>
-#include <arch/arm/aarch32/cortex_r/cmsis.h>
+#include <arch/arm/aarch32/cortex_a_r/cmsis.h>
 
 /**
  *

subsys/testsuite/include/test_asm_inline_gcc.h

@@ -31,7 +31,7 @@ static inline void timestamp_serialize(void)
 	__ISB();
 }
 #elif defined(CONFIG_CPU_CORTEX_R)
-#include <arch/arm/aarch32/cortex_r/cpu.h>
+#include <arch/arm/aarch32/cortex_a_r/cpu.h>
 static inline void timestamp_serialize(void)
 {
 	__ISB();