mb/google/guybrush: Clean up Kconfig entries

Alphabetize board entries, Kconfig selections, and config options.

Change-Id: I599eda8c136d072471f022be9397faeb0e061472
Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78706
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Matt DeVillier 2023-10-27 12:44:45 -05:00 committed by Felix Singer
parent a05be2d1fb
commit baa1d82322
1 changed files with 7 additions and 7 deletions

View File

@ -2,6 +2,7 @@
config BOARD_GOOGLE_BASEBOARD_GUYBRUSH config BOARD_GOOGLE_BASEBOARD_GUYBRUSH
def_bool n def_bool n
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 CONSOLE_CBMEM_DUMP_TO_UART if !CONSOLE_SERIAL select CONSOLE_CBMEM_DUMP_TO_UART if !CONSOLE_SERIAL
@ -43,7 +44,9 @@ config BOARD_GOOGLE_BASEBOARD_GUYBRUSH
select SOC_AMD_COMMON_BLOCK_USE_ESPI select SOC_AMD_COMMON_BLOCK_USE_ESPI
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select TPM_GOOGLE_CR50 select TPM_GOOGLE_CR50
select AMD_FWM_POSITION_C20000_DEFAULT
config BOARD_GOOGLE_DEWATT
select BOARD_GOOGLE_BASEBOARD_GUYBRUSH
config BOARD_GOOGLE_GUYBRUSH config BOARD_GOOGLE_GUYBRUSH
select BOARD_GOOGLE_BASEBOARD_GUYBRUSH select BOARD_GOOGLE_BASEBOARD_GUYBRUSH
@ -52,9 +55,6 @@ config BOARD_GOOGLE_NIPPERKIN
select BOARD_GOOGLE_BASEBOARD_GUYBRUSH select BOARD_GOOGLE_BASEBOARD_GUYBRUSH
select DRIVERS_GFX_GENERIC select DRIVERS_GFX_GENERIC
config BOARD_GOOGLE_DEWATT
select BOARD_GOOGLE_BASEBOARD_GUYBRUSH
if BOARD_GOOGLE_BASEBOARD_GUYBRUSH if BOARD_GOOGLE_BASEBOARD_GUYBRUSH
config VBOOT config VBOOT
@ -84,9 +84,9 @@ config MAINBOARD_DIR
default "google/guybrush" default "google/guybrush"
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "Dewatt" if BOARD_GOOGLE_DEWATT
default "Guybrush" if BOARD_GOOGLE_GUYBRUSH default "Guybrush" if BOARD_GOOGLE_GUYBRUSH
default "Nipperkin" if BOARD_GOOGLE_NIPPERKIN default "Nipperkin" if BOARD_GOOGLE_NIPPERKIN
default "Dewatt" if BOARD_GOOGLE_DEWATT
config DRIVER_TPM_I2C_BUS config DRIVER_TPM_I2C_BUS
hex hex
@ -141,18 +141,18 @@ config OVERRIDE_EFS_SPI_SPEED
config OVERRIDE_EFS_SPI_SPEED_MIN_BOARD config OVERRIDE_EFS_SPI_SPEED_MIN_BOARD
hex hex
default 0x3 if BOARD_GOOGLE_DEWATT
default 0x4 if BOARD_GOOGLE_GUYBRUSH default 0x4 if BOARD_GOOGLE_GUYBRUSH
default 0x2 if BOARD_GOOGLE_NIPPERKIN default 0x2 if BOARD_GOOGLE_NIPPERKIN
default 0x3 if BOARD_GOOGLE_DEWATT
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
configuration has to be applied. configuration has to be applied.
config VARIANT_DIR config VARIANT_DIR
default "dewatt" if BOARD_GOOGLE_DEWATT
default "guybrush" if BOARD_GOOGLE_GUYBRUSH default "guybrush" if BOARD_GOOGLE_GUYBRUSH
default "nipperkin" if BOARD_GOOGLE_NIPPERKIN default "nipperkin" if BOARD_GOOGLE_NIPPERKIN
default "dewatt" if BOARD_GOOGLE_DEWATT
config DEVICETREE config DEVICETREE
default "variants/baseboard/devicetree.cb" default "variants/baseboard/devicetree.cb"