3 files changed, 10 insertions, 5 deletions
diff --git a/src/mainboard/google/trogdor/Kconfig b/src/mainboard/google/trogdor/Kconfig
index 76a89fb0db..dfd98f03ed 100644
--- a/src/mainboard/google/trogdor/Kconfig
+++ b/src/mainboard/google/trogdor/Kconfig
@@ -4,6 +4,9 @@ config BOARD_GOOGLE_TROGDOR_COMMON  # Umbrella option to be selected by variants
 
 if BOARD_GOOGLE_TROGDOR_COMMON
 
+config TROGDOR_REV0
+	def_bool y
+
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_8192
@@ -32,11 +35,13 @@ config MAINBOARD_DIR
 
 config DRIVER_TPM_SPI_BUS
 	hex
-	default 0x6
+	default 0x6 if TROGDOR_REV0
+	default 0x0
 
 config EC_GOOGLE_CHROMEEC_SPI_BUS
 	hex
-	default 0x0
+	default 0x0 if TROGDOR_REV0
+	default 0x6
 
 ##########################################################
 #### Update below when adding a new derivative board. ####
diff --git a/src/mainboard/google/trogdor/board.h b/src/mainboard/google/trogdor/board.h
index 93196d27f8..fa2fb9f5de 100644
--- a/src/mainboard/google/trogdor/board.h
+++ b/src/mainboard/google/trogdor/board.h
@@ -3,6 +3,7 @@
 #ifndef _COREBOOT_SRC_MAINBOARD_GOOGLE_TROGDOR_BOARD_H_
 #define _COREBOOT_SRC_MAINBOARD_GOOGLE_TROGDOR_BOARD_H_
 
+#include <boardid.h>
 #include <gpio.h>
 #include <soc/gpio.h>
 
diff --git a/src/mainboard/google/trogdor/bootblock.c b/src/mainboard/google/trogdor/bootblock.c
index b17c2e7d91..710a2e7734 100644
--- a/src/mainboard/google/trogdor/bootblock.c
+++ b/src/mainboard/google/trogdor/bootblock.c
@@ -2,12 +2,11 @@
 
 #include <bootblock_common.h>
 #include "board.h"
-#include <soc/qcom_qup_se.h>
 #include <soc/qupv3_spi.h>
 
 void bootblock_mainboard_init(void)
 {
 	setup_chromeos_gpios();
-	qup_spi_init(QUPV3_1_SE0, 1010 * KHz); /* H1 SPI */
-	qup_spi_init(QUPV3_0_SE0, 1010 * KHz); /* EC SPI */
+	qup_spi_init(CONFIG_DRIVER_TPM_SPI_BUS, 1010 * KHz);
+	qup_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS, 1010 * KHz);
 }