GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69505
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
This commit is contained in:
Arthur Heymans 2022-11-12 16:16:02 +01:00 committed by Paul Fagerburg
parent 32882c97f9
commit 6e85740236
6 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/arch/x86/Kconfig
View File

@ -28,9 +28,9 @@ config ARCH_RAMSTAGE_X86_32
config ARCH_ALL_STAGES_X86_32 config ARCH_ALL_STAGES_X86_32
bool bool
default ARCH_ALL_STAGES_X86 && !ARCH_ALL_STAGES_X86_64 default !ARCH_ALL_STAGES_X86_64
select ARCH_BOOTBLOCK_X86_32 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_ROMSTAGE_X86_32
select ARCH_RAMSTAGE_X86_32 select ARCH_RAMSTAGE_X86_32
select ARCH_SUPPORTS_CLANG select ARCH_SUPPORTS_CLANG
@ -61,14 +61,10 @@ config ARCH_RAMSTAGE_X86_64
config ARCH_ALL_STAGES_X86_64 config ARCH_ALL_STAGES_X86_64
bool bool
select ARCH_BOOTBLOCK_X86_64 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_ROMSTAGE_X86_64
select ARCH_RAMSTAGE_X86_64 select ARCH_RAMSTAGE_X86_64
config ARCH_ALL_STAGES_X86
bool
default y
config HAVE_EXP_X86_64_SUPPORT config HAVE_EXP_X86_64_SUPPORT
bool bool
help help

7
src/soc/amd/cezanne/Kconfig
View File

@ -10,10 +10,6 @@ if SOC_AMD_CEZANNE
config SOC_SPECIFIC_OPTIONS config SOC_SPECIFIC_OPTIONS
def_bool y def_bool y
select ACPI_SOC_NVS 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 ARCH_X86
select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH
select DRIVERS_USB_ACPI select DRIVERS_USB_ACPI
@ -88,9 +84,6 @@ config SOC_SPECIFIC_OPTIONS
select X86_AMD_FIXED_MTRRS select X86_AMD_FIXED_MTRRS
select X86_INIT_NEED_1_SIPI select X86_INIT_NEED_1_SIPI
config ARCH_ALL_STAGES_X86
default n
config CHIPSET_DEVICETREE config CHIPSET_DEVICETREE
string string
default "soc/amd/cezanne/chipset.cb" default "soc/amd/cezanne/chipset.cb"

7
src/soc/amd/glinda/Kconfig
View File

@ -13,10 +13,6 @@ if SOC_AMD_GLINDA
config SOC_SPECIFIC_OPTIONS config SOC_SPECIFIC_OPTIONS
def_bool y def_bool y
select ACPI_SOC_NVS 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 ARCH_X86
select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH
select DRIVERS_USB_ACPI select DRIVERS_USB_ACPI
@ -93,9 +89,6 @@ config SOC_SPECIFIC_OPTIONS
select X86_AMD_FIXED_MTRRS select X86_AMD_FIXED_MTRRS
select X86_INIT_NEED_1_SIPI select X86_INIT_NEED_1_SIPI
config ARCH_ALL_STAGES_X86
default n
config CHIPSET_DEVICETREE config CHIPSET_DEVICETREE
string string
default "soc/amd/glinda/chipset.cb" default "soc/amd/glinda/chipset.cb"

7
src/soc/amd/mendocino/Kconfig
View File

@ -23,10 +23,6 @@ if SOC_AMD_REMBRANDT_BASE
config SOC_SPECIFIC_OPTIONS config SOC_SPECIFIC_OPTIONS
def_bool y def_bool y
select ACPI_SOC_NVS 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 ARCH_X86
select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH
select DRIVERS_USB_ACPI select DRIVERS_USB_ACPI
@ -106,9 +102,6 @@ config SOC_SPECIFIC_OPTIONS
select X86_AMD_FIXED_MTRRS select X86_AMD_FIXED_MTRRS
select X86_INIT_NEED_1_SIPI select X86_INIT_NEED_1_SIPI
config ARCH_ALL_STAGES_X86
default n
config CHIPSET_DEVICETREE config CHIPSET_DEVICETREE
string string
default "soc/amd/mendocino/chipset_mendocino.cb" if SOC_AMD_MENDOCINO default "soc/amd/mendocino/chipset_mendocino.cb" if SOC_AMD_MENDOCINO

7
src/soc/amd/morgana/Kconfig
View File

@ -13,10 +13,6 @@ if SOC_AMD_MORGANA
config SOC_SPECIFIC_OPTIONS config SOC_SPECIFIC_OPTIONS
def_bool y def_bool y
select ACPI_SOC_NVS 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 ARCH_X86
select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH
select DRIVERS_USB_ACPI select DRIVERS_USB_ACPI
@ -93,9 +89,6 @@ config SOC_SPECIFIC_OPTIONS
select X86_AMD_FIXED_MTRRS select X86_AMD_FIXED_MTRRS
select X86_INIT_NEED_1_SIPI select X86_INIT_NEED_1_SIPI
config ARCH_ALL_STAGES_X86
default n
config CHIPSET_DEVICETREE config CHIPSET_DEVICETREE
string string
default "soc/amd/morgana/chipset.cb" default "soc/amd/morgana/chipset.cb"

7
src/soc/amd/picasso/Kconfig
View File

@ -11,10 +11,6 @@ config CPU_SPECIFIC_OPTIONS
def_bool y def_bool y
select ACPI_SOC_NVS select ACPI_SOC_NVS
select ADD_FSP_BINARIES if USE_AMD_BLOBS 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 ARCH_X86
select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH
select CONSOLE_CBMEM_PRINT_PRE_BOOTBLOCK_CONTENTS if VBOOT_STARTS_BEFORE_BOOTBLOCK 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_AMD_FIXED_MTRRS
select X86_INIT_NEED_1_SIPI select X86_INIT_NEED_1_SIPI
config ARCH_ALL_STAGES_X86
default n
config CHIPSET_DEVICETREE config CHIPSET_DEVICETREE
string string
default "soc/amd/picasso/chipset.cb" default "soc/amd/picasso/chipset.cb"