5 files changed, 72 insertions, 32 deletions

diff --git a/src/mainboard/amd/bilby/Kconfig b/src/mainboard/amd/bilby/Kconfig
index daa6b6ef54..34c7f90e6c 100644
--- a/src/mainboard/amd/bilby/Kconfig
+++ b/src/mainboard/amd/bilby/Kconfig
@@ -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
diff --git a/src/mainboard/amd/majolica/Kconfig b/src/mainboard/amd/majolica/Kconfig
index 0c3f7df8b2..cba0a0fb7e 100644
--- a/src/mainboard/amd/majolica/Kconfig
+++ b/src/mainboard/amd/majolica/Kconfig
@@ -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
diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig
index 9d545b8701..50b3e5d5bc 100644
--- a/src/mainboard/amd/mandolin/Kconfig
+++ b/src/mainboard/amd/mandolin/Kconfig
@@ -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
diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig
index c6e6801ee5..e5b13f4cf2 100644
--- a/src/mainboard/google/guybrush/Kconfig
+++ b/src/mainboard/google/guybrush/Kconfig
@@ -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
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index e93516e07e..c9db2f4892 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -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