Attention is currently required from: Jason Glenesk, Raul Rangel, Matt DeVillier, Fred Reitberger, Felix Held.
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69505 )
Change subject: arch/x86/Kconfig: Move AMD stages arch to common code ......................................................................
arch/x86/Kconfig: Move AMD stages arch to common code
Use VBOOT_STARTS_BEFORE_BOOTBLOCK to determine whether the VERSTAGE needs to be build as x86 stage.
Change-Id: I126801a1f6f523435935bb300f3e2807db347f63 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/arch/x86/Kconfig M src/soc/amd/cezanne/Kconfig M src/soc/amd/glinda/Kconfig M src/soc/amd/mendocino/Kconfig M src/soc/amd/morgana/Kconfig M src/soc/amd/picasso/Kconfig 6 files changed, 16 insertions(+), 42 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/69505/1
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index b60f600..f7b9250 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -28,9 +28,9 @@
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_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 1630df2..30e3e73 100644 --- a/src/soc/amd/cezanne/Kconfig +++ b/src/soc/amd/cezanne/Kconfig @@ -10,10 +10,6 @@ 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 @@ 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 6c09ac9..5bf1d5f 100644 --- a/src/soc/amd/glinda/Kconfig +++ b/src/soc/amd/glinda/Kconfig @@ -13,10 +13,6 @@ 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 @@ 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 9da6138..05c349f 100644 --- a/src/soc/amd/mendocino/Kconfig +++ b/src/soc/amd/mendocino/Kconfig @@ -23,10 +23,6 @@ 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 @@ 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 37d3613..23d296c 100644 --- a/src/soc/amd/morgana/Kconfig +++ b/src/soc/amd/morgana/Kconfig @@ -13,10 +13,6 @@ 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 @@ 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 e852826..7f56803 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -11,10 +11,6 @@ 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 @@ 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"