3 files changed, 22 insertions, 11 deletions
diff --git a/src/mainboard/google/trogdor/Kconfig b/src/mainboard/google/trogdor/Kconfig
index d1dbfe0d99..76a89fb0db 100644
--- a/src/mainboard/google/trogdor/Kconfig
+++ b/src/mainboard/google/trogdor/Kconfig
@@ -8,20 +8,23 @@ config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_8192
 	select COMMON_CBFS_SPI_WRAPPER
-	select EC_GOOGLE_CHROMEEC
-	select EC_GOOGLE_CHROMEEC_RTC
-	select EC_GOOGLE_CHROMEEC_SPI
-	select RTC
+	select EC_GOOGLE_CHROMEEC if !BOARD_GOOGLE_BUBS
+	select EC_GOOGLE_CHROMEEC_RTC if !BOARD_GOOGLE_BUBS
+	select EC_GOOGLE_CHROMEEC_SPI if !BOARD_GOOGLE_BUBS
+	select RTC if !BOARD_GOOGLE_BUBS
+	select MISSING_BOARD_RESET if BOARD_GOOGLE_BUBS
 	select SOC_QUALCOMM_SC7180
 	select SPI_FLASH
 	select SPI_FLASH_WINBOND
 	select MAINBOARD_HAS_CHROMEOS
+	select MAINBOARD_HAS_SPI_TPM_CR50 if !BOARD_GOOGLE_BUBS
+	select MAINBOARD_HAS_TPM2 if !BOARD_GOOGLE_BUBS
 
 config VBOOT
-	select EC_GOOGLE_CHROMEEC_SWITCHES
+	select EC_GOOGLE_CHROMEEC_SWITCHES if !BOARD_GOOGLE_BUBS
 	select VBOOT_VBNV_FLASH
-	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
-	select VBOOT_MOCK_SECDATA
+	select VBOOT_NO_BOARD_SUPPORT if BOARD_GOOGLE_BUBS
+	select VBOOT_MOCK_SECDATA if BOARD_GOOGLE_BUBS
 
 config MAINBOARD_DIR
 	string
@@ -29,11 +32,11 @@ config MAINBOARD_DIR
 
 config DRIVER_TPM_SPI_BUS
 	hex
-	default 0x5
+	default 0x6
 
 config EC_GOOGLE_CHROMEEC_SPI_BUS
 	hex
-	default 0xa
+	default 0x0
 
 ##########################################################
 #### Update below when adding a new derivative board. ####
@@ -43,5 +46,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "Trogdor" if BOARD_GOOGLE_TROGDOR
 	default "Lazor" if BOARD_GOOGLE_LAZOR
+	default "Bubs" if BOARD_GOOGLE_BUBS
 
 endif # BOARD_GOOGLE_TROGDOR_COMMON
diff --git a/src/mainboard/google/trogdor/Kconfig.name b/src/mainboard/google/trogdor/Kconfig.name
index 66636a6ea1..7be1a2d46a 100644
--- a/src/mainboard/google/trogdor/Kconfig.name
+++ b/src/mainboard/google/trogdor/Kconfig.name
@@ -1,3 +1,4 @@
+comment "Trogdor"
 
 config BOARD_GOOGLE_TROGDOR
 	bool "Trogdor"
@@ -6,3 +7,7 @@ config BOARD_GOOGLE_TROGDOR
 config BOARD_GOOGLE_LAZOR
 	bool "Lazor"
 	select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_BUBS
+	bool "Bubs"
+	select BOARD_GOOGLE_TROGDOR_COMMON
diff --git a/src/mainboard/google/trogdor/Makefile.inc b/src/mainboard/google/trogdor/Makefile.inc
index 5c85351a69..3586db5805 100644
--- a/src/mainboard/google/trogdor/Makefile.inc
+++ b/src/mainboard/google/trogdor/Makefile.inc
@@ -13,24 +13,26 @@
 ##
 
 bootblock-y += memlayout.ld
-bootblock-y += reset.c
 bootblock-y += boardid.c
 bootblock-y += chromeos.c
 bootblock-y += bootblock.c
 
 verstage-y += memlayout.ld
+ifneq ($(CONFIG_BOARD_GOOGLE_BUBS),y)
 verstage-y += reset.c
+endif
 verstage-y += boardid.c
 verstage-y += chromeos.c
 
 romstage-y += memlayout.ld
 romstage-y += romstage.c
-romstage-y += reset.c
 romstage-y += boardid.c
 romstage-y += chromeos.c
 
 ramstage-y += memlayout.ld
 ramstage-y += mainboard.c
+ifneq ($(CONFIG_BOARD_GOOGLE_BUBS),y)
 ramstage-y += reset.c
+endif
 ramstage-y += chromeos.c
 ramstage-y += boardid.c