mb/google/zork: Clean up Kconfig entries
Alphabetize board entries, Kconfig selections, and config options. Change-Id: I94e6e584809888fc9cab1b4cff6c0368803c1d47 Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/78708 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
This commit is contained in:
parent
d59f9f6e69
commit
d5008a2e82
|
@ -1,64 +1,66 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
config BOARD_GOOGLE_BASEBOARD_TREMBYLE
|
||||
def_bool n
|
||||
|
||||
config BOARD_GOOGLE_BASEBOARD_DALBOZ
|
||||
def_bool n
|
||||
|
||||
config BOARD_GOOGLE_BASEBOARD_TREMBYLE
|
||||
def_bool n
|
||||
|
||||
config BOARD_GOOGLE_BERKNIP
|
||||
select BOARD_GOOGLE_BASEBOARD_TREMBYLE
|
||||
|
||||
config BOARD_GOOGLE_DALBOZ
|
||||
select BOARD_GOOGLE_BASEBOARD_DALBOZ
|
||||
|
||||
config BOARD_GOOGLE_DIRINBOZ
|
||||
select BOARD_GOOGLE_BASEBOARD_DALBOZ
|
||||
|
||||
config BOARD_GOOGLE_EZKINIL
|
||||
select BOARD_GOOGLE_BASEBOARD_TREMBYLE
|
||||
|
||||
config BOARD_GOOGLE_GUMBOZ
|
||||
select BOARD_GOOGLE_BASEBOARD_DALBOZ
|
||||
|
||||
config BOARD_GOOGLE_MORPHIUS
|
||||
select BOARD_GOOGLE_BASEBOARD_TREMBYLE
|
||||
|
||||
config BOARD_GOOGLE_SHUBOZ
|
||||
select BOARD_GOOGLE_BASEBOARD_DALBOZ
|
||||
|
||||
config BOARD_GOOGLE_TREMBYLE
|
||||
select BOARD_GOOGLE_BASEBOARD_TREMBYLE
|
||||
|
||||
config BOARD_GOOGLE_VILBOZ
|
||||
select BOARD_GOOGLE_BASEBOARD_DALBOZ
|
||||
select DRIVERS_I2C_SX9324
|
||||
select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
|
||||
|
||||
config BOARD_GOOGLE_EZKINIL
|
||||
select BOARD_GOOGLE_BASEBOARD_TREMBYLE
|
||||
|
||||
config BOARD_GOOGLE_MORPHIUS
|
||||
select BOARD_GOOGLE_BASEBOARD_TREMBYLE
|
||||
|
||||
config BOARD_GOOGLE_TREMBYLE
|
||||
select BOARD_GOOGLE_BASEBOARD_TREMBYLE
|
||||
|
||||
config BOARD_GOOGLE_BERKNIP
|
||||
select BOARD_GOOGLE_BASEBOARD_TREMBYLE
|
||||
|
||||
config BOARD_GOOGLE_WOOMAX
|
||||
select BOARD_GOOGLE_BASEBOARD_TREMBYLE
|
||||
|
||||
config BOARD_GOOGLE_DIRINBOZ
|
||||
select BOARD_GOOGLE_BASEBOARD_DALBOZ
|
||||
|
||||
config BOARD_GOOGLE_SHUBOZ
|
||||
select BOARD_GOOGLE_BASEBOARD_DALBOZ
|
||||
|
||||
config BOARD_GOOGLE_GUMBOZ
|
||||
select BOARD_GOOGLE_BASEBOARD_DALBOZ
|
||||
|
||||
if BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ
|
||||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select SOC_AMD_COMMON_BLOCK_USE_ESPI
|
||||
select SOC_AMD_PICASSO
|
||||
select SOC_AMD_COMMON_BLOCK_ACPI_DPTC if BOARD_GOOGLE_MORPHIUS
|
||||
select SOC_AMD_COMMON_BLOCK_GRAPHICS_ATIF
|
||||
select AMD_FWM_POSITION_E20000_DEFAULT
|
||||
select AMD_SOC_CONSOLE_UART
|
||||
select BOARD_ROMSIZE_KB_16384
|
||||
select DRIVERS_AMD_I2S_MACHINE_DEV
|
||||
select DISABLE_SPI_FLASH_ROM_SHARING
|
||||
select DRIVERS_GENERIC_GPIO_KEYS
|
||||
select DRIVERS_AMD_I2S_MACHINE_DEV
|
||||
select DRIVERS_GENERIC_ALC1015
|
||||
select DRIVERS_GENERIC_BAYHUB_LV2
|
||||
select DRIVERS_GENERIC_GPIO_KEYS
|
||||
select DRIVERS_GENERIC_MAX98357A
|
||||
select DRIVERS_UART_ACPI
|
||||
select DRIVERS_USB_ACPI
|
||||
select DRIVERS_I2C_GENERIC
|
||||
select DRIVERS_I2C_HID
|
||||
select EC_GOOGLE_CHROMEEC
|
||||
select EC_GOOGLE_CHROMEEC_AUDIO_CODEC
|
||||
select EC_GOOGLE_CHROMEEC_BOARDID
|
||||
select EC_GOOGLE_CHROMEEC_ESPI
|
||||
select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
|
||||
select EC_GOOGLE_CHROMEEC_I2C_TUNNEL
|
||||
select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
|
||||
select EC_GOOGLE_CHROMEEC_SKUID
|
||||
select ELOG
|
||||
select ELOG_BOOT_COUNT
|
||||
|
@ -67,23 +69,21 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select FW_CONFIG_SOURCE_CHROMEEC_CBI
|
||||
select GFXUMA
|
||||
select GOOGLE_SMBIOS_MAINBOARD_VERSION
|
||||
select MAINBOARD_HAS_CHROMEOS
|
||||
select AMD_SOC_CONSOLE_UART
|
||||
select HAVE_ACPI_RESUME
|
||||
select HAVE_EM100_SUPPORT
|
||||
select I2C_TPM
|
||||
select TPM_GOOGLE_CR50
|
||||
select MAINBOARD_HAS_CHROMEOS
|
||||
select MAINBOARD_HAS_TPM2
|
||||
select PCIEXP_ASPM
|
||||
select PCIEXP_CLK_PM
|
||||
select PCIEXP_COMMON_CLOCK
|
||||
select PCIEXP_L1_SUB_STATE
|
||||
select HAVE_EM100_SUPPORT
|
||||
select SOC_AMD_COMMON_BLOCK_ACPI_DPTC if BOARD_GOOGLE_MORPHIUS
|
||||
select SOC_AMD_COMMON_BLOCK_USE_ESPI
|
||||
select SOC_AMD_COMMON_BLOCK_GRAPHICS_ATIF
|
||||
select SOC_AMD_PICASSO
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
select DRIVERS_GENERIC_MAX98357A
|
||||
select HAVE_ACPI_RESUME
|
||||
select DRIVERS_USB_ACPI
|
||||
select DRIVERS_UART_ACPI
|
||||
select DRIVERS_GENERIC_BAYHUB_LV2
|
||||
select AMD_FWM_POSITION_E20000_DEFAULT
|
||||
select TPM_GOOGLE_CR50
|
||||
|
||||
config ELOG_BOOT_COUNT_CMOS_OFFSET
|
||||
int
|
||||
|
@ -98,33 +98,33 @@ config MAINBOARD_DIR
|
|||
default "google/zork"
|
||||
|
||||
config VARIANT_DIR
|
||||
default "ezkinil" if BOARD_GOOGLE_EZKINIL
|
||||
default "morphius" if BOARD_GOOGLE_MORPHIUS
|
||||
default "trembyle" if BOARD_GOOGLE_TREMBYLE
|
||||
default "dalboz" if BOARD_GOOGLE_DALBOZ
|
||||
default "berknip" if BOARD_GOOGLE_BERKNIP
|
||||
default "dalboz" if BOARD_GOOGLE_DALBOZ
|
||||
default "dirinboz" if BOARD_GOOGLE_DIRINBOZ
|
||||
default "ezkinil" if BOARD_GOOGLE_EZKINIL
|
||||
default "gumboz" if BOARD_GOOGLE_GUMBOZ
|
||||
default "morphius" if BOARD_GOOGLE_MORPHIUS
|
||||
default "shuboz" if BOARD_GOOGLE_SHUBOZ
|
||||
default "trembyle" if BOARD_GOOGLE_TREMBYLE
|
||||
default "vilboz" if BOARD_GOOGLE_VILBOZ
|
||||
default "woomax" if BOARD_GOOGLE_WOOMAX
|
||||
default "dirinboz" if BOARD_GOOGLE_DIRINBOZ
|
||||
default "shuboz" if BOARD_GOOGLE_SHUBOZ
|
||||
default "gumboz" if BOARD_GOOGLE_GUMBOZ
|
||||
|
||||
config MAINBOARD_PART_NUMBER
|
||||
default "Ezkinil" if BOARD_GOOGLE_EZKINIL
|
||||
default "Morphius" if BOARD_GOOGLE_MORPHIUS
|
||||
default "Trembyle" if BOARD_GOOGLE_TREMBYLE
|
||||
default "Dalboz" if BOARD_GOOGLE_DALBOZ
|
||||
default "Berknip" if BOARD_GOOGLE_BERKNIP
|
||||
default "Dalboz" if BOARD_GOOGLE_DALBOZ
|
||||
default "Dirinboz" if BOARD_GOOGLE_DIRINBOZ
|
||||
default "Ezkinil" if BOARD_GOOGLE_EZKINIL
|
||||
default "Gumboz" if BOARD_GOOGLE_GUMBOZ
|
||||
default "Morphius" if BOARD_GOOGLE_MORPHIUS
|
||||
default "Shuboz" if BOARD_GOOGLE_SHUBOZ
|
||||
default "Trembyle" if BOARD_GOOGLE_TREMBYLE
|
||||
default "Vilboz" if BOARD_GOOGLE_VILBOZ
|
||||
default "Woomax" if BOARD_GOOGLE_WOOMAX
|
||||
default "Dirinboz" if BOARD_GOOGLE_DIRINBOZ
|
||||
default "Shuboz" if BOARD_GOOGLE_SHUBOZ
|
||||
default "Gumboz" if BOARD_GOOGLE_GUMBOZ
|
||||
|
||||
config BASEBOARD_DIR
|
||||
string
|
||||
default "trembyle" if BOARD_GOOGLE_BASEBOARD_TREMBYLE
|
||||
default "dalboz" if BOARD_GOOGLE_BASEBOARD_DALBOZ
|
||||
default "trembyle" if BOARD_GOOGLE_BASEBOARD_TREMBYLE
|
||||
|
||||
config DEVICETREE
|
||||
default "variants/baseboard/\$(CONFIG_BASEBOARD_DIR)/devicetree.cb"
|
||||
|
@ -173,11 +173,11 @@ config GSC_IRQ_GPIO
|
|||
|
||||
config VARIANT_SUPPORTS_PRE_V3_SCHEMATICS
|
||||
bool
|
||||
default y if BOARD_GOOGLE_TREMBYLE
|
||||
default y if BOARD_GOOGLE_EZKINIL
|
||||
default y if BOARD_GOOGLE_MORPHIUS
|
||||
default y if BOARD_GOOGLE_BERKNIP
|
||||
default y if BOARD_GOOGLE_DALBOZ
|
||||
default y if BOARD_GOOGLE_EZKINIL
|
||||
default y if BOARD_GOOGLE_MORPHIUS
|
||||
default y if BOARD_GOOGLE_TREMBYLE
|
||||
default n
|
||||
help
|
||||
Whether this variant supports pre-v3 version of schematics.
|
||||
|
@ -187,27 +187,27 @@ config VARIANT_SUPPORTS_PRE_V3_SCHEMATICS
|
|||
|
||||
config VARIANT_SUPPORTS_PRE_V3_6_SCHEMATICS
|
||||
bool
|
||||
default y if BOARD_GOOGLE_TREMBYLE
|
||||
default y if BOARD_GOOGLE_EZKINIL
|
||||
default y if BOARD_GOOGLE_MORPHIUS
|
||||
default y if BOARD_GOOGLE_BERKNIP
|
||||
default y if BOARD_GOOGLE_DALBOZ
|
||||
default y if BOARD_GOOGLE_WOOMAX
|
||||
default y if BOARD_GOOGLE_VILBOZ
|
||||
default y if BOARD_GOOGLE_DIRINBOZ
|
||||
default y if BOARD_GOOGLE_EZKINIL
|
||||
default y if BOARD_GOOGLE_MORPHIUS
|
||||
default y if BOARD_GOOGLE_TREMBYLE
|
||||
default y if BOARD_GOOGLE_VILBOZ
|
||||
default y if BOARD_GOOGLE_WOOMAX
|
||||
default n
|
||||
|
||||
config VARIANT_MIN_BOARD_ID_V3_6_SCHEMATICS
|
||||
int
|
||||
depends on VARIANT_SUPPORTS_PRE_V3_6_SCHEMATICS
|
||||
default 4 if BOARD_GOOGLE_TREMBYLE
|
||||
default 3 if BOARD_GOOGLE_EZKINIL
|
||||
default 4 if BOARD_GOOGLE_MORPHIUS
|
||||
default 3 if BOARD_GOOGLE_BERKNIP
|
||||
default 3 if BOARD_GOOGLE_DALBOZ
|
||||
default 1 if BOARD_GOOGLE_WOOMAX
|
||||
default 2 if BOARD_GOOGLE_VILBOZ
|
||||
default 2 if BOARD_GOOGLE_DIRINBOZ
|
||||
default 3 if BOARD_GOOGLE_EZKINIL
|
||||
default 4 if BOARD_GOOGLE_MORPHIUS
|
||||
default 4 if BOARD_GOOGLE_TREMBYLE
|
||||
default 2 if BOARD_GOOGLE_VILBOZ
|
||||
default 1 if BOARD_GOOGLE_WOOMAX
|
||||
default 256
|
||||
help
|
||||
Minimum board version where the variant starts supporting
|
||||
|
@ -216,11 +216,11 @@ config VARIANT_MIN_BOARD_ID_V3_6_SCHEMATICS
|
|||
config VARIANT_MIN_BOARD_ID_V3_SCHEMATICS
|
||||
int
|
||||
depends on VARIANT_SUPPORTS_PRE_V3_SCHEMATICS
|
||||
default 4 if BOARD_GOOGLE_TREMBYLE
|
||||
default 3 if BOARD_GOOGLE_EZKINIL
|
||||
default 3 if BOARD_GOOGLE_MORPHIUS
|
||||
default 2 if BOARD_GOOGLE_BERKNIP
|
||||
default 3 if BOARD_GOOGLE_DALBOZ
|
||||
default 3 if BOARD_GOOGLE_EZKINIL
|
||||
default 3 if BOARD_GOOGLE_MORPHIUS
|
||||
default 4 if BOARD_GOOGLE_TREMBYLE
|
||||
default 256
|
||||
help
|
||||
Minimum board version where the variant starts supporting
|
||||
|
@ -264,8 +264,8 @@ config VARIANT_HAS_FPMCU
|
|||
|
||||
config VARIANT_MAX_BOARD_ID_BROKEN_FMPCU_POWER
|
||||
int
|
||||
default 4 if BOARD_GOOGLE_MORPHIUS
|
||||
default 3 if BOARD_GOOGLE_BERKNIP
|
||||
default 4 if BOARD_GOOGLE_MORPHIUS
|
||||
default 0
|
||||
help
|
||||
Last board version that needs the extra delay for FPMCU init.
|
||||
|
@ -296,8 +296,8 @@ config CHROMEOS_WIFI_SAR
|
|||
default y if CHROMEOS
|
||||
select DRIVERS_WIFI_GENERIC
|
||||
select DSAR_ENABLE
|
||||
select GEO_SAR_ENABLE
|
||||
select SAR_ENABLE
|
||||
select USE_SAR
|
||||
select GEO_SAR_ENABLE
|
||||
|
||||
endif # BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ
|
||||
|
|
Loading…
Reference in New Issue