arch: arm64: rename CONFIG_ARMV8_A_NS to CONFIG_ARM64_NS

Nicolas Pitre · Nicolas Pitre · commit 1bf36e286dfb · 2025-10-03T08:18:38.000-04:00
The CONFIG_ARMV8_A_NS option controls TrustZone Non-Secure state
configuration, which is not specific to ARMv8-A but applies to the
broader ARM64 architecture family including both ARMv8-A and ARMv9-A.

No functional changes.

Signed-off-by: Nicolas Pitre &lt;npitre@baylibre.com&gt;
diff --git a/arch/arm64/core/Kconfig b/arch/arm64/core/Kconfig
@@ -216,8 +216,8 @@ config ARM64_STACK_PROTECTION
 
 if CPU_CORTEX_A
 
-config ARMV8_A_NS
-	bool "ARMv8-A Normal World (Non-Secure world of Trustzone)"
+config ARM64_NS
+	bool "ARM64 Normal World (Non-Secure world of Trustzone)"
 	help
 	  This option signifies that Zephyr is entered in TrustZone
 	  Non-Secure state
diff --git a/arch/arm64/core/reset.c b/arch/arm64/core/reset.c
@@ -81,7 +81,7 @@ void z_arm64_el3_init(void)
 	write_cptr_el3(reg);
 
 	reg = 0U;			/* Reset */
-#ifdef CONFIG_ARMV8_A_NS
+#ifdef CONFIG_ARM64_NS
 	reg |= SCR_NS_BIT;		/* EL2 / EL3 non-secure */
 #else
 	if (is_in_secure_state() && is_el2_sec_supported()) {
diff --git a/boards/amd/versalnet_apu/versalnet_apu_defconfig b/boards/amd/versalnet_apu/versalnet_apu_defconfig
@@ -17,7 +17,7 @@ CONFIG_UART_CONSOLE=y
 CONFIG_UART_PL011=y
 
 # This should be commented in order to test at EL1 S (EL1 Secure)
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # FPU support is disabled due to QEMU limitations. When CONFIG_FPU_SHARING
 # is enabled, it uses the swpal instruction which QEMU does not emulate.
diff --git a/boards/arm/fvp_base_revc_2xaem/doc/index.rst b/boards/arm/fvp_base_revc_2xaem/doc/index.rst
@@ -143,7 +143,7 @@ For SMP Non-Secure variants with TF-A:
 Running Zephyr at EL1NS
 ***********************
 
-In order to run Zephyr as EL1NS with ``CONFIG_ARMV8_A_NS``, you'll need a proper
+In order to run Zephyr as EL1NS with ``CONFIG_ARM64_NS``, you'll need a proper
 Trusted Firmware loaded in the FVP model.
 
 The ARM TF-A for FVP can be used to run Zephyr as preloaded BL33 payload.
diff --git a/boards/arm/fvp_base_revc_2xaem/fvp_base_revc_2xaem_v8a_smp_ns_defconfig b/boards/arm/fvp_base_revc_2xaem/fvp_base_revc_2xaem_v8a_smp_ns_defconfig
@@ -18,7 +18,7 @@ CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
 # Enable TFA
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_BUILD_WITH_TFA=y
 
 # Enable SMP
diff --git a/boards/arm/fvp_base_revc_2xaem/fvp_base_revc_2xaem_v9a_smp_ns_defconfig b/boards/arm/fvp_base_revc_2xaem/fvp_base_revc_2xaem_v9a_smp_ns_defconfig
@@ -18,7 +18,7 @@ CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
 # Enable TFA
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_BUILD_WITH_TFA=y
 
 # Enable SMP
diff --git a/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_a53_defconfig b/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6232_a53_defconfig
@@ -6,7 +6,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_ARM64_VA_BITS_36=y
 CONFIG_ARM64_PA_BITS_36=y
 
diff --git a/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6254_a53_defconfig b/boards/beagle/pocketbeagle_2/pocketbeagle_2_am6254_a53_defconfig
@@ -6,7 +6,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_ARM64_VA_BITS_36=y
 CONFIG_ARM64_PA_BITS_36=y
 
diff --git a/boards/firefly/roc_rk3568_pc/roc_rk3568_pc_defconfig b/boards/firefly/roc_rk3568_pc/roc_rk3568_pc_defconfig
@@ -15,7 +15,7 @@ CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
 # ARMv8 NS world with cache management
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_CACHE_MANAGEMENT=y
 
 # Clock support
diff --git a/boards/firefly/roc_rk3568_pc/roc_rk3568_pc_rk3568_smp_defconfig b/boards/firefly/roc_rk3568_pc/roc_rk3568_pc_rk3568_smp_defconfig
@@ -15,7 +15,7 @@ CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
 # ARMv8 NS world with cache management
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_CACHE_MANAGEMENT=y
 CONFIG_DCACHE=y
 
diff --git a/boards/firefly/roc_rk3588_pc/roc_rk3588_pc_defconfig b/boards/firefly/roc_rk3588_pc/roc_rk3588_pc_defconfig
@@ -14,7 +14,7 @@ CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
 # ARMv8 NS world with cache management
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_CACHE_MANAGEMENT=y
 
 CONFIG_TICKLESS_KERNEL=y
diff --git a/boards/firefly/roc_rk3588_pc/roc_rk3588_pc_smp_defconfig b/boards/firefly/roc_rk3588_pc/roc_rk3588_pc_smp_defconfig
@@ -14,7 +14,7 @@ CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
 # ARMv8 NS world with cache management
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_CACHE_MANAGEMENT=y
 CONFIG_DCACHE=y
 
diff --git a/boards/intel/socfpga/agilex5_socdk/intel_socfpga_agilex5_socdk_defconfig b/boards/intel/socfpga/agilex5_socdk/intel_socfpga_agilex5_socdk_defconfig
@@ -11,7 +11,7 @@ CONFIG_FORTIFY_SOURCE_RUN_TIME=y
 # Arm Features
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_CACHE_MANAGEMENT=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # Serial Drivers
 CONFIG_SERIAL=y
diff --git a/boards/khadas/edge2/khadas_edge2_defconfig b/boards/khadas/edge2/khadas_edge2_defconfig
@@ -6,7 +6,7 @@ CONFIG_ARM64_VA_BITS_40=y
 CONFIG_ARM64_PA_BITS_40=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=24000000
 CONFIG_CACHE_MANAGEMENT=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # Serial Drivers
 CONFIG_SERIAL=y
diff --git a/boards/khadas/edgev/khadas_edgev_defconfig b/boards/khadas/edgev/khadas_edgev_defconfig
@@ -5,7 +5,7 @@ CONFIG_ARM64_VA_BITS_40=y
 CONFIG_ARM64_PA_BITS_40=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=24000000
 CONFIG_CACHE_MANAGEMENT=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # Serial Drivers
 CONFIG_SERIAL=y
diff --git a/boards/nxp/frdm_imx91/frdm_imx91_mimx9131_defconfig b/boards/nxp/frdm_imx91/frdm_imx91_mimx9131_defconfig
@@ -5,7 +5,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # MMU Options
 # Increase the value when encounter the assert on the MAX_XLAT_TABLES
diff --git a/boards/nxp/frdm_imx93/frdm_imx93_mimx9352_a55_defconfig b/boards/nxp/frdm_imx93/frdm_imx93_mimx9352_a55_defconfig
@@ -5,7 +5,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # MMU Options
 CONFIG_MAX_XLAT_TABLES=64
diff --git a/boards/nxp/imx8mm_evk/imx8mm_evk_mimx8mm6_a53_defconfig b/boards/nxp/imx8mm_evk/imx8mm_evk_mimx8mm6_a53_defconfig
@@ -2,7 +2,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_ARM64_VA_BITS_36=y
 CONFIG_ARM64_PA_BITS_36=y
 
diff --git a/boards/nxp/imx8mm_evk/imx8mm_evk_mimx8mm6_a53_smp_defconfig b/boards/nxp/imx8mm_evk/imx8mm_evk_mimx8mm6_a53_smp_defconfig
@@ -2,7 +2,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_ARM64_VA_BITS_36=y
 CONFIG_ARM64_PA_BITS_36=y
 
diff --git a/boards/nxp/imx8mn_evk/imx8mn_evk_mimx8mn6_a53_defconfig b/boards/nxp/imx8mn_evk/imx8mn_evk_mimx8mn6_a53_defconfig
@@ -2,7 +2,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_ARM64_VA_BITS_36=y
 CONFIG_ARM64_PA_BITS_36=y
 
diff --git a/boards/nxp/imx8mn_evk/imx8mn_evk_mimx8mn6_a53_smp_defconfig b/boards/nxp/imx8mn_evk/imx8mn_evk_mimx8mn6_a53_smp_defconfig
@@ -2,7 +2,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_ARM64_VA_BITS_36=y
 CONFIG_ARM64_PA_BITS_36=y
 
diff --git a/boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_a53_defconfig b/boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_a53_defconfig
@@ -2,7 +2,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_ARM64_VA_BITS_36=y
 CONFIG_ARM64_PA_BITS_36=y
 
diff --git a/boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_a53_smp_defconfig b/boards/nxp/imx8mp_evk/imx8mp_evk_mimx8ml8_a53_smp_defconfig
@@ -2,7 +2,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_ARM64_VA_BITS_36=y
 CONFIG_ARM64_PA_BITS_36=y
 
diff --git a/boards/nxp/imx91_evk/imx91_evk_mimx9131_defconfig b/boards/nxp/imx91_evk/imx91_evk_mimx9131_defconfig
@@ -5,7 +5,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # MMU Options
 # Increase the value when encounter the assert on the MAX_XLAT_TABLES
diff --git a/boards/nxp/imx91_qsb/imx91_qsb_mimx9111_defconfig b/boards/nxp/imx91_qsb/imx91_qsb_mimx9111_defconfig
@@ -5,7 +5,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # MMU Options
 # Increase the value when encounter the assert on the MAX_XLAT_TABLES
diff --git a/boards/nxp/imx93_evk/imx93_evk_mimx9352_a55_defconfig b/boards/nxp/imx93_evk/imx93_evk_mimx9352_a55_defconfig
@@ -5,7 +5,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # MMU Options
 CONFIG_MAX_XLAT_TABLES=64
diff --git a/boards/nxp/imx93_evk/imx93_evk_mimx9352_a55_smp_defconfig b/boards/nxp/imx93_evk/imx93_evk_mimx9352_a55_smp_defconfig
@@ -5,7 +5,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # MMU Options
 CONFIG_MAX_XLAT_TABLES=64
diff --git a/boards/nxp/imx943_evk/imx943_evk_mimx94398_a55_defconfig b/boards/nxp/imx943_evk/imx943_evk_mimx94398_a55_defconfig
@@ -5,7 +5,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # MMU Options
 CONFIG_MAX_XLAT_TABLES=24
diff --git a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_defconfig b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_defconfig
@@ -5,7 +5,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # MMU Options
 CONFIG_MAX_XLAT_TABLES=64
diff --git a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp_defconfig b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp_defconfig
@@ -5,7 +5,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # MMU Options
 CONFIG_MAX_XLAT_TABLES=64
diff --git a/boards/nxp/imx95_evk_15x15/imx95_evk_15x15_mimx9596_a55_defconfig b/boards/nxp/imx95_evk_15x15/imx95_evk_15x15_mimx9596_a55_defconfig
@@ -5,7 +5,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # MMU Options
 CONFIG_MAX_XLAT_TABLES=64
diff --git a/boards/nxp/ls1046ardb/ls1046ardb_ls1046a_smp_4cores_defconfig b/boards/nxp/ls1046ardb/ls1046ardb_ls1046a_smp_4cores_defconfig
@@ -16,7 +16,7 @@ CONFIG_MAX_XLAT_TABLES=10
 CONFIG_SMP=y
 CONFIG_MP_MAX_NUM_CPUS=4
 CONFIG_CACHE_MANAGEMENT=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # PSCI is supported
 CONFIG_PM_CPU_OPS=y
diff --git a/boards/nxp/ls1046ardb/ls1046ardb_ls1046a_smp_defconfig b/boards/nxp/ls1046ardb/ls1046ardb_ls1046a_smp_defconfig
@@ -26,7 +26,7 @@ CONFIG_MAX_XLAT_TABLES=10
 CONFIG_SMP=y
 CONFIG_MP_MAX_NUM_CPUS=2
 CONFIG_CACHE_MANAGEMENT=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # PSCI is supported
 CONFIG_PM_CPU_OPS=y
diff --git a/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_a53_defconfig b/boards/phytec/phyboard_lyra/phyboard_lyra_am6234_a53_defconfig
@@ -2,7 +2,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_ARM64_VA_BITS_36=y
 CONFIG_ARM64_PA_BITS_36=y
 
diff --git a/boards/phytec/phyboard_nash/phyboard_nash_a55_defconfig b/boards/phytec/phyboard_nash/phyboard_nash_a55_defconfig
@@ -9,7 +9,7 @@ CONFIG_CONSOLE=y
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # MMU Options
 CONFIG_MAX_XLAT_TABLES=64
diff --git a/boards/qemu/cortex_a53/board.cmake b/boards/qemu/cortex_a53/board.cmake
@@ -6,7 +6,7 @@ set(QEMU_ARCH aarch64)
 
 set(QEMU_CPU_TYPE_${ARCH} cortex-a53)
 
-if(CONFIG_ARMV8_A_NS)
+if(CONFIG_ARM64_NS)
   set(QEMU_MACH virt,gic-version=3)
 else()
   set(QEMU_MACH virt,secure=on,gic-version=3)
diff --git a/boards/qemu/cortex_a53/qemu_cortex_a53_qemu_cortex_a53_smp_defconfig b/boards/qemu/cortex_a53/qemu_cortex_a53_qemu_cortex_a53_smp_defconfig
@@ -16,9 +16,9 @@ CONFIG_UART_INTERRUPT_DRIVEN=y
 # icount does not work well with SMP
 CONFIG_QEMU_ICOUNT=n
 
-# We have multiple QEMU-A53 boards, so let us exercise ARMV8_A_NS on this one
+# We have multiple QEMU-A53 boards, so let us exercise ARM64_NS on this one
 # (plus it is needed for SMP)
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # PSCI is supported with NS
 CONFIG_PM_CPU_OPS=y
diff --git a/boards/qemu/kvm_arm64/board.cmake b/boards/qemu/kvm_arm64/board.cmake
@@ -7,7 +7,7 @@ set(QEMU_ARCH aarch64)
 
 set(QEMU_MACH virt,gic-version=3,accel=kvm)
 
-if(NOT CONFIG_ARMV8_A_NS)
+if(NOT CONFIG_ARM64_NS)
   set(QEMU_MACH ${QEMU_MACH},secure=on)
 endif()
 
diff --git a/boards/qemu/kvm_arm64/qemu_kvm_arm64_defconfig b/boards/qemu/kvm_arm64/qemu_kvm_arm64_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME=y
 CONFIG_QEMU_ICOUNT=n
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # Cache management
 CONFIG_CACHE_MANAGEMENT=y
diff --git a/boards/renesas/rcar_h3ulcb/rcar_h3ulcb_r8a77951_a57_defconfig b/boards/renesas/rcar_h3ulcb/rcar_h3ulcb_r8a77951_a57_defconfig
@@ -11,7 +11,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=8300000
 CONFIG_XIP=n
 
 CONFIG_MAX_XLAT_TABLES=24
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # Enable console
 CONFIG_CONSOLE=y
diff --git a/boards/renesas/rcar_salvator_xs/rcar_salvator_xs_defconfig b/boards/renesas/rcar_salvator_xs/rcar_salvator_xs_defconfig
@@ -11,7 +11,7 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=8300000
 CONFIG_XIP=n
 
 CONFIG_MAX_XLAT_TABLES=24
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 
 # Enable console
 CONFIG_CONSOLE=y
diff --git a/boards/renesas/rcar_spider_s4/rcar_spider_s4_r8a779f0_a55_defconfig b/boards/renesas/rcar_spider_s4/rcar_spider_s4_r8a779f0_a55_defconfig
@@ -16,4 +16,4 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=16666666
 CONFIG_AARCH64_IMAGE_HEADER=y
 CONFIG_XIP=n
 CONFIG_MAX_XLAT_TABLES=24
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
diff --git a/boards/variscite/imx8mp_var_dart/imx8mp_var_dart_mimx8ml8_a53_defconfig b/boards/variscite/imx8mp_var_dart/imx8mp_var_dart_mimx8ml8_a53_defconfig
@@ -3,7 +3,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_ARM64_VA_BITS_36=y
 CONFIG_ARM64_PA_BITS_36=y
 
diff --git a/boards/variscite/imx8mp_var_som/imx8mp_var_som_mimx8ml8_a53_defconfig b/boards/variscite/imx8mp_var_som/imx8mp_var_som_mimx8ml8_a53_defconfig
@@ -3,7 +3,7 @@
 
 # ARM Options
 CONFIG_AARCH64_IMAGE_HEADER=y
-CONFIG_ARMV8_A_NS=y
+CONFIG_ARM64_NS=y
 CONFIG_ARM64_VA_BITS_36=y
 CONFIG_ARM64_PA_BITS_36=y
 
diff --git a/boards/variscite/imx93_var_dart/imx93_var_dart_mimx9352_a55_defconfig b/boards/variscite/imx93_var_dart/imx93_var_dart_mimx9352_a55_defconfig
diff --git a/boards/variscite/imx93_var_som/imx93_var_som_mimx9352_a55_defconfig b/boards/variscite/imx93_var_som/imx93_var_som_mimx9352_a55_defconfig
diff --git a/cmake/emu/armfvp.cmake b/cmake/emu/armfvp.cmake
diff --git a/drivers/interrupt_controller/Kconfig.gic b/drivers/interrupt_controller/Kconfig.gic
diff --git a/drivers/interrupt_controller/intc_gicv3.c b/drivers/interrupt_controller/intc_gicv3.c
diff --git a/drivers/tee/optee/Kconfig b/drivers/tee/optee/Kconfig
diff --git a/include/zephyr/arch/arm64/arm_mmu.h b/include/zephyr/arch/arm64/arm_mmu.h
diff --git a/include/zephyr/arch/arm64/lib_helpers.h b/include/zephyr/arch/arm64/lib_helpers.h
diff --git a/samples/drivers/ethernet/eth_ivshmem/boards/qemu_cortex_a53.conf b/samples/drivers/ethernet/eth_ivshmem/boards/qemu_cortex_a53.conf
