diff options
| -rw-r--r-- | src/mainboard/google/skyrim/Kconfig | 58 |
1 files changed, 27 insertions, 31 deletions
diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig index be5afada15..98d13ddf04 100644 --- a/src/mainboard/google/skyrim/Kconfig +++ b/src/mainboard/google/skyrim/Kconfig @@ -3,14 +3,8 @@ config BOARD_GOOGLE_BASEBOARD_SKYRIM def_bool n -config BOARD_GOOGLE_SKYRIM +config BOARD_GOOGLE_CRYSTALDRIFT select BOARD_GOOGLE_BASEBOARD_SKYRIM - select SOC_AMD_COMMON_BLOCK_ACPI_DPTC - -config BOARD_GOOGLE_WINTERHOLD - select BOARD_GOOGLE_BASEBOARD_SKYRIM - select SOC_AMD_COMMON_BLOCK_ACPI_DPTC - select FEATURE_DYNAMIC_DPTC config BOARD_GOOGLE_FROSTFLOW select BOARD_GOOGLE_BASEBOARD_SKYRIM @@ -18,18 +12,25 @@ config BOARD_GOOGLE_FROSTFLOW select FEATURE_TABLET_MODE_DPTC select SOC_AMD_COMMON_BLOCK_ACPI_DPTC -config BOARD_GOOGLE_CRYSTALDRIFT +config BOARD_GOOGLE_MARKARTH select BOARD_GOOGLE_BASEBOARD_SKYRIM + select SOC_AMD_COMMON_BLOCK_ACPI_DPTC -config BOARD_GOOGLE_MARKARTH +config BOARD_GOOGLE_SKYRIM select BOARD_GOOGLE_BASEBOARD_SKYRIM select SOC_AMD_COMMON_BLOCK_ACPI_DPTC +config BOARD_GOOGLE_WINTERHOLD + select BOARD_GOOGLE_BASEBOARD_SKYRIM + select SOC_AMD_COMMON_BLOCK_ACPI_DPTC + select FEATURE_DYNAMIC_DPTC + if BOARD_GOOGLE_BASEBOARD_SKYRIM config BOARD_SPECIFIC_OPTIONS def_bool y select ACPI_S1_NOT_SUPPORTED + select AMD_FWM_POSITION_C20000_DEFAULT select AMD_SOC_CONSOLE_UART select BOARD_ROMSIZE_KB_16384 select DISABLE_KEYBOARD_RESET_PIN @@ -42,12 +43,12 @@ config BOARD_SPECIFIC_OPTIONS select DRIVERS_I2C_NAU8825 select DRIVERS_USB_HUB select DRIVERS_UART_ACPI - select DRIVERS_PCIE_RTD3_DEVICE select DRIVERS_PCIE_GENERIC + select DRIVERS_PCIE_RTD3_DEVICE select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_ESPI select EC_GOOGLE_CHROMEEC_SKUID - select EC_GOOGLE_CHROMEEC_BOARDID select ELOG select ELOG_GSMI select FW_CONFIG @@ -58,17 +59,16 @@ config BOARD_SPECIFIC_OPTIONS select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_TPM2 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_COMMON_BLOCK_I2C3_TPM_SHARED_WITH_PSP select SOC_AMD_COMMON_BLOCK_USE_ESPI select SOC_AMD_GFX_CACHE_VBIOS_IN_FMAP if CHROMEOS && RUN_FSP_GOP select SYSTEM_TYPE_LAPTOP 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 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" config PERFORM_SPL_FUSING - default y if BOARD_GOOGLE_WINTERHOLD - default y if BOARD_GOOGLE_FROSTFLOW - default y if BOARD_GOOGLE_MARKARTH - default y if BOARD_GOOGLE_CRYSTALDRIFT - default n + default n if BOARD_GOOGLE_SKYRIM + default y config FMDFILE default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" @@ -126,11 +123,11 @@ config MAINBOARD_FAMILY default "Google_Skyrim" config MAINBOARD_PART_NUMBER - default "Skyrim" if BOARD_GOOGLE_SKYRIM - default "Winterhold" if BOARD_GOOGLE_WINTERHOLD - default "Frostflow" if BOARD_GOOGLE_FROSTFLOW 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 "Winterhold" if BOARD_GOOGLE_WINTERHOLD config OVERRIDE_DEVICETREE string @@ -138,16 +135,15 @@ config OVERRIDE_DEVICETREE config VARIANT_DIR string - default "skyrim" if BOARD_GOOGLE_SKYRIM - default "winterhold" if BOARD_GOOGLE_WINTERHOLD - default "frostflow" if BOARD_GOOGLE_FROSTFLOW 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 "winterhold" if BOARD_GOOGLE_WINTERHOLD config USE_VARIANT_DXIO_DESCRIPTOR bool - default y if BOARD_GOOGLE_WINTERHOLD - default y if BOARD_GOOGLE_MARKARTH + default y if BOARD_GOOGLE_MARKARTH || BOARD_GOOGLE_WINTERHOLD default n help 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 hex - default 0x5 if BOARD_GOOGLE_SKYRIM + default 0x1 if BOARD_GOOGLE_CRYSTALDRIFT default 0x1 if BOARD_GOOGLE_FROSTFLOW default 0x1 if BOARD_GOOGLE_MARKARTH - default 0x1 if BOARD_GOOGLE_CRYSTALDRIFT + default 0x5 if BOARD_GOOGLE_SKYRIM default 0xffffffff help Minimum board version starting which the Override EFS SPI Speed |