6 files changed, 3 insertions, 42 deletions

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index b60f600541..f7b92506f5 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -28,9 +28,9 @@ config ARCH_RAMSTAGE_X86_32
 
 config ARCH_ALL_STAGES_X86_32
 	bool
-	default ARCH_ALL_STAGES_X86 && !ARCH_ALL_STAGES_X86_64
+	default !ARCH_ALL_STAGES_X86_64
 	select ARCH_BOOTBLOCK_X86_32
-	select ARCH_VERSTAGE_X86_32
+	select ARCH_VERSTAGE_X86_32 if !VBOOT_STARTS_BEFORE_BOOTBLOCK
 	select ARCH_ROMSTAGE_X86_32
 	select ARCH_RAMSTAGE_X86_32
 	select ARCH_SUPPORTS_CLANG
@@ -61,14 +61,10 @@ config ARCH_RAMSTAGE_X86_64
 config ARCH_ALL_STAGES_X86_64
 	bool
 	select ARCH_BOOTBLOCK_X86_64
-	select ARCH_VERSTAGE_X86_64
+	select ARCH_VERSTAGE_X86_64 if !VBOOT_STARTS_BEFORE_BOOTBLOCK
 	select ARCH_ROMSTAGE_X86_64
 	select ARCH_RAMSTAGE_X86_64
 
-config ARCH_ALL_STAGES_X86
-	bool
-	default y
-
 config HAVE_EXP_X86_64_SUPPORT
 	bool
 	help
diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig
index 1630df2e72..30e3e73930 100644
--- a/src/soc/amd/cezanne/Kconfig
+++ b/src/soc/amd/cezanne/Kconfig
@@ -10,10 +10,6 @@ if SOC_AMD_CEZANNE
 config SOC_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_SOC_NVS
-	select ARCH_BOOTBLOCK_X86_32
-	select ARCH_VERSTAGE_X86_32 if !VBOOT_STARTS_BEFORE_BOOTBLOCK
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select ARCH_X86
 	select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH
 	select DRIVERS_USB_ACPI
@@ -88,9 +84,6 @@ config SOC_SPECIFIC_OPTIONS
 	select X86_AMD_FIXED_MTRRS
 	select X86_INIT_NEED_1_SIPI
 
-config ARCH_ALL_STAGES_X86
-	default n
-
 config CHIPSET_DEVICETREE
 	string
 	default "soc/amd/cezanne/chipset.cb"
diff --git a/src/soc/amd/glinda/Kconfig b/src/soc/amd/glinda/Kconfig
index 6c09ac911b..5bf1d5f129 100644
--- a/src/soc/amd/glinda/Kconfig
+++ b/src/soc/amd/glinda/Kconfig
@@ -13,10 +13,6 @@ if SOC_AMD_GLINDA
 config SOC_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_SOC_NVS
-	select ARCH_BOOTBLOCK_X86_32
-	select ARCH_VERSTAGE_X86_32 if !VBOOT_STARTS_BEFORE_BOOTBLOCK
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select ARCH_X86
 	select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH
 	select DRIVERS_USB_ACPI
@@ -93,9 +89,6 @@ config SOC_SPECIFIC_OPTIONS
 	select X86_AMD_FIXED_MTRRS
 	select X86_INIT_NEED_1_SIPI
 
-config ARCH_ALL_STAGES_X86
-	default n
-
 config CHIPSET_DEVICETREE
 	string
 	default "soc/amd/glinda/chipset.cb"
diff --git a/src/soc/amd/mendocino/Kconfig b/src/soc/amd/mendocino/Kconfig
index 9da6138ef8..05c349f165 100644
--- a/src/soc/amd/mendocino/Kconfig
+++ b/src/soc/amd/mendocino/Kconfig
@@ -23,10 +23,6 @@ if SOC_AMD_REMBRANDT_BASE
 config SOC_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_SOC_NVS
-	select ARCH_BOOTBLOCK_X86_32
-	select ARCH_VERSTAGE_X86_32 if !VBOOT_STARTS_BEFORE_BOOTBLOCK
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select ARCH_X86
 	select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH
 	select DRIVERS_USB_ACPI
@@ -106,9 +102,6 @@ config SOC_SPECIFIC_OPTIONS
 	select X86_AMD_FIXED_MTRRS
 	select X86_INIT_NEED_1_SIPI
 
-config ARCH_ALL_STAGES_X86
-	default n
-
 config CHIPSET_DEVICETREE
 	string
 	default "soc/amd/mendocino/chipset_mendocino.cb" if SOC_AMD_MENDOCINO
diff --git a/src/soc/amd/morgana/Kconfig b/src/soc/amd/morgana/Kconfig
index 37d36131c0..23d296c8f9 100644
--- a/src/soc/amd/morgana/Kconfig
+++ b/src/soc/amd/morgana/Kconfig
@@ -13,10 +13,6 @@ if SOC_AMD_MORGANA
 config SOC_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_SOC_NVS
-	select ARCH_BOOTBLOCK_X86_32
-	select ARCH_VERSTAGE_X86_32 if !VBOOT_STARTS_BEFORE_BOOTBLOCK
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select ARCH_X86
 	select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH
 	select DRIVERS_USB_ACPI
@@ -93,9 +89,6 @@ config SOC_SPECIFIC_OPTIONS
 	select X86_AMD_FIXED_MTRRS
 	select X86_INIT_NEED_1_SIPI
 
-config ARCH_ALL_STAGES_X86
-	default n
-
 config CHIPSET_DEVICETREE
 	string
 	default "soc/amd/morgana/chipset.cb"
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index e8528268c9..7f56803f8e 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -11,10 +11,6 @@ config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_SOC_NVS
 	select ADD_FSP_BINARIES if USE_AMD_BLOBS
-	select ARCH_BOOTBLOCK_X86_32
-	select ARCH_VERSTAGE_X86_32 if !VBOOT_STARTS_BEFORE_BOOTBLOCK
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
 	select ARCH_X86
 	select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH
 	select CONSOLE_CBMEM_PRINT_PRE_BOOTBLOCK_CONTENTS if VBOOT_STARTS_BEFORE_BOOTBLOCK
@@ -80,9 +76,6 @@ config CPU_SPECIFIC_OPTIONS
 	select X86_AMD_FIXED_MTRRS
 	select X86_INIT_NEED_1_SIPI
 
-config ARCH_ALL_STAGES_X86
-	default n
-
 config CHIPSET_DEVICETREE
 	string
 	default "soc/amd/picasso/chipset.cb"