arch/x86: Introduce ARCH_ALL_STAGES_X86_32

Nearly every x86 platform uses the same arch for all stages. The only
exception is Picasso. So, factor out redundant symbols from the rest.

Alder Lake is not yet complete, so it has been skipped for now.

Change-Id: I7cff9efbc44546807d9af089292c69fb0acc7bad
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45731
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>

src/arch/x86/Kconfig

@@ -28,6 +28,13 @@ config ARCH_RAMSTAGE_X86_32
 	bool
 	select ARCH_X86
 
+config ARCH_ALL_STAGES_X86_32
+	bool
+	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_VERSTAGE_X86_32
+	select ARCH_ROMSTAGE_X86_32
+	select ARCH_RAMSTAGE_X86_32
+
 # stage selectors for x64
 
 config ARCH_BOOTBLOCK_X86_64

src/cpu/amd/agesa/Kconfig

@@ -6,10 +6,7 @@ config CPU_AMD_AGESA
 	default y if CPU_AMD_AGESA_FAMILY15_TN
 	default y if CPU_AMD_AGESA_FAMILY16_KB
 	default n
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select DRIVERS_AMD_PI
 	select TSC_SYNC_LFENCE
 	select UDELAY_LAPIC

src/cpu/amd/pi/Kconfig

@@ -6,10 +6,7 @@ config CPU_AMD_PI
 	default y if CPU_AMD_PI_00730F01
 	default y if CPU_AMD_PI_00660F01
 	default n
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select DRIVERS_AMD_PI
 	select TSC_SYNC_LFENCE
 	select UDELAY_LAPIC

src/cpu/intel/haswell/Kconfig

@@ -6,10 +6,7 @@ if CPU_INTEL_HASWELL
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select MMX
 	select SSE2
 	select UDELAY_TSC

src/cpu/intel/model_1067x/Kconfig

@@ -1,9 +1,6 @@
 config CPU_INTEL_MODEL_1067X
 	bool
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select SSE2
 	select UDELAY_TSC
 	select TSC_MONOTONIC_TIMER

src/cpu/intel/model_106cx/Kconfig

@@ -1,9 +1,6 @@
 config CPU_INTEL_MODEL_106CX
 	bool
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select SSE2
 	select UDELAY_TSC
 	select TSC_MONOTONIC_TIMER

src/cpu/intel/model_2065x/Kconfig

@@ -5,10 +5,7 @@ if CPU_INTEL_MODEL_2065X
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select SSE2
 	select UDELAY_TSC
 	select TSC_MONOTONIC_TIMER

src/cpu/intel/model_206ax/Kconfig

@@ -5,10 +5,7 @@ if CPU_INTEL_MODEL_206AX
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select MMX
 	select SSE2
 	select UDELAY_TSC

src/cpu/intel/model_65x/Kconfig

@@ -1,7 +1,4 @@
 config CPU_INTEL_MODEL_65X
 	bool
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select SUPPORT_CPU_UCODE_IN_CBFS

src/cpu/intel/model_67x/Kconfig

@@ -1,7 +1,4 @@
 config CPU_INTEL_MODEL_67X
 	bool
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select SUPPORT_CPU_UCODE_IN_CBFS

src/cpu/intel/model_68x/Kconfig

@@ -2,8 +2,5 @@
 
 config CPU_INTEL_MODEL_68X
 	bool
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select SUPPORT_CPU_UCODE_IN_CBFS

src/cpu/intel/model_6bx/Kconfig

@@ -1,7 +1,4 @@
 config CPU_INTEL_MODEL_6BX
 	bool
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select SUPPORT_CPU_UCODE_IN_CBFS

src/cpu/intel/model_6ex/Kconfig

@@ -1,9 +1,6 @@
 config CPU_INTEL_MODEL_6EX
 	bool
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select SSE2
 	select UDELAY_TSC
 	select TSC_MONOTONIC_TIMER

src/cpu/intel/model_6fx/Kconfig

@@ -1,9 +1,6 @@
 config CPU_INTEL_MODEL_6FX
 	bool
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select SSE2
 	select UDELAY_TSC
 	select TSC_MONOTONIC_TIMER

src/cpu/intel/model_6xx/Kconfig

@@ -1,7 +1,4 @@
 config CPU_INTEL_MODEL_6XX
 	bool
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select SUPPORT_CPU_UCODE_IN_CBFS

src/cpu/intel/model_f2x/Kconfig

@@ -1,9 +1,6 @@
 config CPU_INTEL_MODEL_F2X
 	bool
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select SMM_ASEG
 	select CPU_INTEL_COMMON

src/cpu/intel/model_f3x/Kconfig

@@ -1,9 +1,6 @@
 config CPU_INTEL_MODEL_F3X
 	bool
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select CPU_INTEL_COMMON
 	select CPU_INTEL_COMMON_HYPERTHREADING

src/cpu/intel/model_f4x/Kconfig

@@ -1,7 +1,4 @@
 config CPU_INTEL_MODEL_F4X
 	bool
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select SUPPORT_CPU_UCODE_IN_CBFS

src/cpu/qemu-x86/Kconfig

@@ -19,9 +19,6 @@ config CPU_QEMU_X86_32
 	bool
 	default n if CPU_QEMU_X86_64
 	default y
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
 	select ARCH_POSTCAR_X86_32
-	select ARCH_RAMSTAGE_X86_32
 endif

src/soc/amd/stoneyridge/Kconfig

@@ -9,10 +9,7 @@ if SOC_AMD_STONEYRIDGE
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select X86_AMD_FIXED_MTRRS
 	select ACPI_AMD_HARDWARE_SLEEP_VALUES
 	select COLLECT_TIMESTAMPS_NO_TSC

src/soc/intel/apollolake/Kconfig

@@ -21,10 +21,7 @@ config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_INTEL_HARDWARE_SLEEP_VALUES
 	select ACPI_NO_PCAT_8259
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_RAMSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_VERSTAGE_X86_32
 	select BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY if BOOT_DEVICE_SPI_FLASH
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	# CPU specific options

src/soc/intel/baytrail/Kconfig

@@ -8,10 +8,7 @@ if SOC_INTEL_BAYTRAIL
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_INTEL_HARDWARE_SLEEP_VALUES
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CACHE_MRC_SETTINGS
 	select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED

src/soc/intel/braswell/Kconfig

@@ -8,10 +8,7 @@ if SOC_INTEL_BRASWELL
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_INTEL_HARDWARE_SLEEP_VALUES
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_RAMSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_VERSTAGE_X86_32
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CACHE_MRC_SETTINGS
 	select SUPPORT_CPU_UCODE_IN_CBFS

src/soc/intel/broadwell/Kconfig

@@ -8,10 +8,7 @@ if SOC_INTEL_BROADWELL
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_INTEL_HARDWARE_SLEEP_VALUES
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CACHE_MRC_SETTINGS
 	select MRC_SETTINGS_PROTECT

src/soc/intel/cannonlake/Kconfig

@@ -74,10 +74,7 @@ config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_INTEL_HARDWARE_SLEEP_VALUES
 	select ACPI_NHLT
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_RAMSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_VERSTAGE_X86_32
 	select BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY if BOOT_DEVICE_SPI_FLASH
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CACHE_MRC_SETTINGS

src/soc/intel/denverton_ns/Kconfig

@@ -9,10 +9,7 @@ if SOC_INTEL_DENVERTON_NS
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_RAMSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_VERSTAGE_X86_32
 	select BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY if BOOT_DEVICE_SPI_FLASH
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select DEBUG_GPIO

src/soc/intel/elkhartlake/Kconfig

@@ -8,10 +8,7 @@ if SOC_INTEL_ELKHARTLAKE
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_INTEL_HARDWARE_SLEEP_VALUES
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_RAMSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_VERSTAGE_X86_32
 	select BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY if BOOT_DEVICE_SPI_FLASH
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CACHE_MRC_SETTINGS

src/soc/intel/icelake/Kconfig

@@ -8,10 +8,7 @@ if SOC_INTEL_ICELAKE
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_INTEL_HARDWARE_SLEEP_VALUES
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_RAMSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_VERSTAGE_X86_32
 	select BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY if BOOT_DEVICE_SPI_FLASH
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CACHE_MRC_SETTINGS

src/soc/intel/jasperlake/Kconfig

@@ -8,10 +8,7 @@ if SOC_INTEL_JASPERLAKE
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_INTEL_HARDWARE_SLEEP_VALUES
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_RAMSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_VERSTAGE_X86_32
 	select BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY if BOOT_DEVICE_SPI_FLASH
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CACHE_MRC_SETTINGS

src/soc/intel/quark/Kconfig

@@ -9,10 +9,7 @@ if SOC_INTEL_QUARK
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_RAMSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_VERSTAGE_X86_32
 	select NO_MMCONF_SUPPORT
 	select REG_SCRIPT
 	select PLATFORM_USES_FSP2_0

src/soc/intel/skylake/Kconfig

@@ -19,10 +19,7 @@ config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_INTEL_HARDWARE_SLEEP_VALUES
 	select ACPI_NHLT
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_RAMSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_VERSTAGE_X86_32
 	select BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY if BOOT_DEVICE_SPI_FLASH
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CACHE_MRC_SETTINGS

src/soc/intel/tigerlake/Kconfig

@@ -8,10 +8,7 @@ if SOC_INTEL_TIGERLAKE
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_INTEL_HARDWARE_SLEEP_VALUES
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_RAMSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_VERSTAGE_X86_32
 	select BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY if BOOT_DEVICE_SPI_FLASH
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CACHE_MRC_SETTINGS

src/soc/intel/xeon_sp/Kconfig

@@ -25,10 +25,7 @@ if XEON_SP_COMMON_BASE
 
 config	CPU_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_BOOTBLOCK_X86_32
+	select ARCH_ALL_STAGES_X86_32
-	select ARCH_RAMSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_VERSTAGE_X86_32
 	select BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY if BOOT_DEVICE_SPI_FLASH
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CPU_INTEL_COMMON