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

mb/(amd,google): Update SPI Kconfig settings based on devicetree 

This takes the devicetree SPI settings and moves them into Kconfig.

BUG=b:195943311
TEST=boot guybrush & majolica and verify spi settings.

Signed-off-by: Martin Roth <martinroth@chromium.org>
Change-Id: Icce1d57761465ae8255e5d9ce8679f3fdcb0ceed
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56885
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
This commit is contained in:
Martin Roth 2021-08-09 10:39:27 -06:00 committed by Felix Held
parent f032221bd1
commit dd6c7331ac
5 changed files with 72 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mainboard/amd/bilby/Kconfig
View File

@ -92,20 +92,27 @@ config VGA_BIOS_DGPU_FILE
string
default "3rdparty/amd_blobs/picasso/PicassoGenericVbios.bin"
if !EM100 # EM100 defaults in soc/amd/common/blocks/spi/Kconfig
config EFS_SPI_READ_MODE
int
default 0 if EM100
default 3
default 3 # Quad IO (1-1-4)
config EFS_SPI_SPEED
int
default 3 if EM100
default 0
default 0 # 66MHz
config EFS_SPI_MICRON_FLAG
int
default 0
config NORMAL_READ_SPI_SPEED
default 1 # 33MHz
config ALT_SPI_SPEED
default 1 # 33MHz
config TPM_SPI_SPEED
default 1 # 33MHz
endif # !EM100
choice
prompt "DDI-0 connector type"
default CONNECT_DP_ON_DDI_0

21
src/mainboard/amd/majolica/Kconfig
View File

@ -53,12 +53,25 @@ config CHROMEOS
# Use default libpayload config
select LP_DEFCONFIG_OVERRIDE if PAYLOAD_DEPTHCHARGE
if !EM100 # EM100 defaults in soc/amd/common/blocks/spi/Kconfig
config EFS_SPI_READ_MODE
default 0 if EM100 # Normal read mode
default 3 # Quad IO (1-1-4)
default 3 # Quad IO (1-1-4)
config EFS_SPI_SPEED
default 3 if EM100 # 16.66 MHz
default 0 # 66.66 MHz
default 0 # 66MHz
config EFS_SPI_MICRON_FLAG
default 0
config NORMAL_READ_SPI_SPEED
default 1 # 33MHz
config ALT_SPI_SPEED
default 1 # 33MHz
config TPM_SPI_SPEED
default 1 # 33MHz
endif # !EM100
endif # BOARD_AMD_MAJOLICA

23
src/mainboard/amd/mandolin/Kconfig
View File

@ -124,20 +124,25 @@ config VGA_BIOS_DGPU_FILE
default "3rdparty/amd_blobs/picasso/PicassoGenericVbios.bin" if BOARD_AMD_MANDOLIN
default "3rdparty/amd_blobs/picasso/Raven2GenericVbios.bin" if BOARD_AMD_CEREME
if !EM100 # EM100 defaults in soc/amd/common/blocks/spi/Kconfig
config EFS_SPI_READ_MODE
int
default 0 if EM100
default 0 if BOARD_AMD_CEREME
default 3
default 3 # Quad IO (1-1-4)
config EFS_SPI_SPEED
int
default 3 if EM100
default 1 if BOARD_AMD_CEREME
default 0
default 0 # 66MHz
config EFS_SPI_MICRON_FLAG
int
default 0
config NORMAL_READ_SPI_SPEED
default 1 # 33MHz
config ALT_SPI_SPEED
default 1 # 33MHz
config TPM_SPI_SPEED
default 1 # 33MHz
endif # !EM100
endif # BOARD_AMD_MANDOLIN || BOARD_AMD_CEREME

18
src/mainboard/google/guybrush/Kconfig
View File

@ -94,15 +94,23 @@ config AMDFW_CONFIG_FILE
string
default "src/mainboard/google/guybrush/variants/baseboard/amdfw.cfg"
if !EM100 # EM100 defaults in soc/amd/common/blocks/spi/Kconfig
config EFS_SPI_READ_MODE
int
default 0 if EM100 # Normal read mode
default 4 # Dual IO (1-2-2)
config EFS_SPI_SPEED
int
default 3 if EM100 # 16.66 MHz
default 1 # 33.33 MHz
default 0 # 66MHz
config EFS_SPI_MICRON_FLAG
default 0
config NORMAL_READ_SPI_SPEED
default 1 # 33MHz
config ALT_SPI_SPEED
default 0 # 66MHz
endif # !EM100
config VARIANT_DIR
default "guybrush" if BOARD_GOOGLE_GUYBRUSH

21
src/mainboard/google/zork/Kconfig
View File

@ -245,20 +245,27 @@ config VARIANT_MAX_BOARD_ID_BROKEN_FMPCU_POWER
help
Last board version that needs the extra delay for FPMCU init.
if !EM100 # EM100 defaults in soc/amd/common/blocks/spi/Kconfig
config EFS_SPI_READ_MODE
int
default 0 if EM100 # Normal read mode
default 2 # Dual IO (1-1-2)
default 4 # Dual IO (1-2-2)
config EFS_SPI_SPEED
int
default 3 if EM100 # 16.66 MHz
default 0 # 66.66 MHz
default 0 # 66MHz
config EFS_SPI_MICRON_FLAG
int
default 0
config NORMAL_READ_SPI_SPEED
default 1 # 33MHz
config ALT_SPI_SPEED
default 0 # 66MHz
config TPM_SPI_SPEED
default 0 # 66MHz
endif # !EM100
config CHROMEOS_WIFI_SAR
bool
default y if CHROMEOS