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

mb/google/skyrim: Clean up Kconfig entries 

Alphabetize board entries, Kconfig selections, and config options.
Reverse default logic of PERFORM_SPL_FUSING for simplicity / clarity.

Change-Id: Ib25bb8c7bbf994f2f0675c4599c70a7db5d9f7ef
Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78704
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
This commit is contained in:
Matt DeVillier 2023-10-27 12:32:55 -05:00 committed by Felix Singer
parent 2a8c71c11b
commit cea9415079
1 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/mainboard/google/skyrim/Kconfig
View File

@ -3,6 +3,19 @@
config BOARD_GOOGLE_BASEBOARD_SKYRIM config BOARD_GOOGLE_BASEBOARD_SKYRIM
def_bool n def_bool n
config BOARD_GOOGLE_CRYSTALDRIFT
select BOARD_GOOGLE_BASEBOARD_SKYRIM
config BOARD_GOOGLE_FROSTFLOW
select BOARD_GOOGLE_BASEBOARD_SKYRIM
select DRIVERS_GENESYSLOGIC_GL9755
select FEATURE_TABLET_MODE_DPTC
select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
config BOARD_GOOGLE_MARKARTH
select BOARD_GOOGLE_BASEBOARD_SKYRIM
select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
config BOARD_GOOGLE_SKYRIM config BOARD_GOOGLE_SKYRIM
select BOARD_GOOGLE_BASEBOARD_SKYRIM select BOARD_GOOGLE_BASEBOARD_SKYRIM
select SOC_AMD_COMMON_BLOCK_ACPI_DPTC select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
@ -12,24 +25,12 @@ config BOARD_GOOGLE_WINTERHOLD
select SOC_AMD_COMMON_BLOCK_ACPI_DPTC select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
select FEATURE_DYNAMIC_DPTC select FEATURE_DYNAMIC_DPTC
config BOARD_GOOGLE_FROSTFLOW
select BOARD_GOOGLE_BASEBOARD_SKYRIM
select DRIVERS_GENESYSLOGIC_GL9755
select FEATURE_TABLET_MODE_DPTC
select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
config BOARD_GOOGLE_CRYSTALDRIFT
select BOARD_GOOGLE_BASEBOARD_SKYRIM
config BOARD_GOOGLE_MARKARTH
select BOARD_GOOGLE_BASEBOARD_SKYRIM
select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
if BOARD_GOOGLE_BASEBOARD_SKYRIM if BOARD_GOOGLE_BASEBOARD_SKYRIM
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select ACPI_S1_NOT_SUPPORTED select ACPI_S1_NOT_SUPPORTED
select AMD_FWM_POSITION_C20000_DEFAULT
select AMD_SOC_CONSOLE_UART select AMD_SOC_CONSOLE_UART
select BOARD_ROMSIZE_KB_16384 select BOARD_ROMSIZE_KB_16384
select DISABLE_KEYBOARD_RESET_PIN select DISABLE_KEYBOARD_RESET_PIN
@ -42,12 +43,12 @@ config BOARD_SPECIFIC_OPTIONS
select DRIVERS_I2C_NAU8825 select DRIVERS_I2C_NAU8825
select DRIVERS_USB_HUB select DRIVERS_USB_HUB
select DRIVERS_UART_ACPI select DRIVERS_UART_ACPI
select DRIVERS_PCIE_RTD3_DEVICE
select DRIVERS_PCIE_GENERIC select DRIVERS_PCIE_GENERIC
select DRIVERS_PCIE_RTD3_DEVICE
select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_BOARDID
select EC_GOOGLE_CHROMEEC_ESPI select EC_GOOGLE_CHROMEEC_ESPI
select EC_GOOGLE_CHROMEEC_SKUID select EC_GOOGLE_CHROMEEC_SKUID
select EC_GOOGLE_CHROMEEC_BOARDID
select ELOG select ELOG
select ELOG_GSMI select ELOG_GSMI
select FW_CONFIG select FW_CONFIG
@ -58,17 +59,16 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_TPM2 select MAINBOARD_HAS_TPM2
select MB_COMPRESS_RAMSTAGE_LZ4 select MB_COMPRESS_RAMSTAGE_LZ4
select PCIEXP_ASPM
select PCIEXP_CLK_PM
select PCIEXP_COMMON_CLOCK
select PCIEXP_L1_SUB_STATE
select SOC_AMD_MENDOCINO select SOC_AMD_MENDOCINO
select SOC_AMD_COMMON_BLOCK_I2C3_TPM_SHARED_WITH_PSP select SOC_AMD_COMMON_BLOCK_I2C3_TPM_SHARED_WITH_PSP
select SOC_AMD_COMMON_BLOCK_USE_ESPI select SOC_AMD_COMMON_BLOCK_USE_ESPI
select SOC_AMD_GFX_CACHE_VBIOS_IN_FMAP if CHROMEOS && RUN_FSP_GOP select SOC_AMD_GFX_CACHE_VBIOS_IN_FMAP if CHROMEOS && RUN_FSP_GOP
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select TPM_GOOGLE_TI50 select TPM_GOOGLE_TI50
select PCIEXP_ASPM
select PCIEXP_CLK_PM
select PCIEXP_COMMON_CLOCK
select PCIEXP_L1_SUB_STATE
select AMD_FWM_POSITION_C20000_DEFAULT
config DEVICETREE config DEVICETREE
default "variants/baseboard/devicetree.cb" default "variants/baseboard/devicetree.cb"
@ -109,11 +109,8 @@ config SPL_RW_AB_TABLE_FILE
default "3rdparty/blobs/mainboard/google/skyrim/TypeId0x55_SplTableBl_MDN_CHROME.sbin" default "3rdparty/blobs/mainboard/google/skyrim/TypeId0x55_SplTableBl_MDN_CHROME.sbin"
config PERFORM_SPL_FUSING config PERFORM_SPL_FUSING
default y if BOARD_GOOGLE_WINTERHOLD default n if BOARD_GOOGLE_SKYRIM
default y if BOARD_GOOGLE_FROSTFLOW default y
default y if BOARD_GOOGLE_MARKARTH
default y if BOARD_GOOGLE_CRYSTALDRIFT
default n
config FMDFILE config FMDFILE
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd"
@ -126,11 +123,11 @@ config MAINBOARD_FAMILY
default "Google_Skyrim" default "Google_Skyrim"
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "Crystaldrift" if BOARD_GOOGLE_CRYSTALDRIFT
default "Frostflow" if BOARD_GOOGLE_FROSTFLOW
default "Markarth" if BOARD_GOOGLE_MARKARTH
default "Skyrim" if BOARD_GOOGLE_SKYRIM default "Skyrim" if BOARD_GOOGLE_SKYRIM
default "Winterhold" if BOARD_GOOGLE_WINTERHOLD default "Winterhold" if BOARD_GOOGLE_WINTERHOLD
default "Frostflow" if BOARD_GOOGLE_FROSTFLOW
default "Crystaldrift" if BOARD_GOOGLE_CRYSTALDRIFT
default "Markarth" if BOARD_GOOGLE_MARKARTH
config OVERRIDE_DEVICETREE config OVERRIDE_DEVICETREE
string string
@ -138,16 +135,15 @@ config OVERRIDE_DEVICETREE
config VARIANT_DIR config VARIANT_DIR
string string
default "crystaldrift" if BOARD_GOOGLE_CRYSTALDRIFT
default "frostflow" if BOARD_GOOGLE_FROSTFLOW
default "markarth" if BOARD_GOOGLE_MARKARTH
default "skyrim" if BOARD_GOOGLE_SKYRIM default "skyrim" if BOARD_GOOGLE_SKYRIM
default "winterhold" if BOARD_GOOGLE_WINTERHOLD default "winterhold" if BOARD_GOOGLE_WINTERHOLD
default "frostflow" if BOARD_GOOGLE_FROSTFLOW
default "crystaldrift" if BOARD_GOOGLE_CRYSTALDRIFT
default "markarth" if BOARD_GOOGLE_MARKARTH
config USE_VARIANT_DXIO_DESCRIPTOR config USE_VARIANT_DXIO_DESCRIPTOR
bool bool
default y if BOARD_GOOGLE_WINTERHOLD default y if BOARD_GOOGLE_MARKARTH || BOARD_GOOGLE_WINTERHOLD
default y if BOARD_GOOGLE_MARKARTH
default n default n
help help
Enable this to allow a variant to override the dxio descriptor values Enable this to allow a variant to override the dxio descriptor values
@ -201,10 +197,10 @@ config OVERRIDE_EFS_SPI_SPEED
config OVERRIDE_EFS_SPI_SPEED_MIN_BOARD config OVERRIDE_EFS_SPI_SPEED_MIN_BOARD
hex hex
default 0x5 if BOARD_GOOGLE_SKYRIM default 0x1 if BOARD_GOOGLE_CRYSTALDRIFT
default 0x1 if BOARD_GOOGLE_FROSTFLOW default 0x1 if BOARD_GOOGLE_FROSTFLOW
default 0x1 if BOARD_GOOGLE_MARKARTH default 0x1 if BOARD_GOOGLE_MARKARTH
default 0x1 if BOARD_GOOGLE_CRYSTALDRIFT default 0x5 if BOARD_GOOGLE_SKYRIM
default 0xffffffff default 0xffffffff
help help
Minimum board version starting which the Override EFS SPI Speed Minimum board version starting which the Override EFS SPI Speed