soc: arm: fvp_aem: Create unified SOC series structure

Nicolas Pitre · Nicolas Pitre · commit a6e54134882e · 2025-10-01T06:46:46.000-04:00
Reorganize fvp_aemv8a SOC into unified fvp_aem series with a v8a
architecture variants to enable cleaner board target naming. This also
sets the stage for upcoming ARMv9-A support.

Signed-off-by: Nicolas Pitre &lt;npitre@baylibre.com&gt;
diff --git a/boards/arm/fvp_base_revc_2xaemv8a/Kconfig.fvp_base_revc_2xaemv8a b/boards/arm/fvp_base_revc_2xaemv8a/Kconfig.fvp_base_revc_2xaemv8a
@@ -2,5 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_FVP_BASE_REVC_2XAEMV8A
-	select SOC_SERIES_FVP_AEMV8A
-	select SOC_FVP_BASE_REVC_2XAEMV8A
+	select SOC_FVP_V8A
diff --git a/boards/arm/fvp_base_revc_2xaemv8a/board.yml b/boards/arm/fvp_base_revc_2xaemv8a/board.yml
@@ -3,7 +3,7 @@ board:
   full_name: BASE RevC AEMv8A Fixed Virtual Platforms
   vendor: arm
   socs:
-  - name: fvp_base_revc_2xaemv8a
+  - name: v8a
     variants:
     - name: smp
       variants:
diff --git a/soc/arm/fvp_aem/CMakeLists.txt b/soc/arm/fvp_aem/CMakeLists.txt
diff --git a/soc/arm/fvp_aem/Kconfig b/soc/arm/fvp_aem/Kconfig
@@ -1,10 +1,12 @@
 # Copyright (c) 2021 Carlo Caione <ccaione@baylibre.com>
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_SERIES_FVP_AEMV8A
-	select ARM64
+config SOC_SERIES_FVP_AEM
+	bool
 	help
-	  Enable support for ARM FVP AEMv8A AArch64 Series
+	  Enable support for ARM FVP AEM (Architectural Envelope Model) Series
 
-config SOC_FVP_BASE_REVC_2XAEMV8A
+config SOC_FVP_V8A
+	bool
+	select ARM64
 	select CPU_CORTEX_A53
diff --git a/soc/arm/fvp_aem/Kconfig.defconfig b/soc/arm/fvp_aem/Kconfig.defconfig
@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Carlo Caione <ccaione@baylibre.com>
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_SERIES_FVP_AEMV8A
+if SOC_SERIES_FVP_AEM
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 100000000
@@ -10,8 +10,6 @@ config NUM_IRQS
 	default 16384 if GIC_V3_ITS
 	default 128 if !GIC_V3_ITS
 
-if SOC_FVP_BASE_REVC_2XAEMV8A
-
 # Workaround for not being able to have commas in macro arguments
 DT_CHOSEN_Z_FLASH := zephyr,flash
 
@@ -21,6 +19,4 @@ config FLASH_SIZE
 config FLASH_BASE_ADDRESS
 	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
 
-endif # SOC_FVP_BASE_REVC_2XAEMV8A
-
-endif # SOC_SERIES_FVP_AEMV8A
+endif # SOC_SERIES_FVP_AEM
diff --git a/soc/arm/fvp_aem/Kconfig.soc b/soc/arm/fvp_aem/Kconfig.soc
@@ -0,0 +1,16 @@
+# Copyright (c) 2021 Carlo Caione <ccaione@baylibre.com>
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_FVP_AEM
+	bool
+	select SOC_FAMILY_ARM64
+
+config SOC_FVP_V8A
+	bool
+	select SOC_SERIES_FVP_AEM
+
+config SOC
+	default "v8a" if SOC_FVP_V8A
+
+config SOC_SERIES
+	default "fvp_aem" if SOC_SERIES_FVP_AEM
diff --git a/soc/arm/fvp_aem/mmu_regions.c b/soc/arm/fvp_aem/mmu_regions.c
diff --git a/soc/arm/fvp_aemv8a/Kconfig.soc b/soc/arm/fvp_aemv8a/Kconfig.soc
diff --git a/soc/arm/soc.yml b/soc/arm/soc.yml
@@ -29,9 +29,9 @@ family:
     - name: designstart_fpga_cortex_m3
 - name: arm64
   series:
-  - name: fvp_aemv8a
+  - name: fvp_aem
     socs:
-    - name: fvp_base_revc_2xaemv8a
+    - name: v8a
   - name: fvp_aemv8r
     socs:
     - name: fvp_aemv8r_aarch64
