[coreboot-gerrit] Change in coreboot[master]: trogdor: add support for Bubs variant

[mturney mturney (Code Review)]

mturney mturney has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant
......................................................................

trogdor: add support for Bubs variant

Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984
Signed-off-by: T Michael Turney 
---
A payloads/libpayload/configs/config.bubs
M src/mainboard/google/trogdor/Kconfig
M src/mainboard/google/trogdor/Kconfig.name
M src/mainboard/google/trogdor/reset.c
4 files changed, 24 insertions(+), 8 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/37069/1

diff --git a/payloads/libpayload/configs/config.bubs b/payloads/libpayload/configs/config.bubs
new file mode 100644
index 0000000..7e162e5
--- /dev/null
+++ b/payloads/libpayload/configs/config.bubs
@@ -0,0 +1,8 @@
+CONFIG_LP_CHROMEOS=y
+CONFIG_LP_ARCH_ARM64=y
+CONFIG_LP_TIMER_ARM64_ARCH=y
+CONFIG_LP_SERIAL_CONSOLE=y
+CONFIG_LP_QUALCOMM_QUPV3_SERIAL_CONSOLE=y
+CONFIG_LP_USB=y
+CONFIG_LP_USB_EHCI=y
+CONFIG_LP_USB_XHCI=y
diff --git a/src/mainboard/google/trogdor/Kconfig b/src/mainboard/google/trogdor/Kconfig
index 56b3a72..6377c3a 100644
--- a/src/mainboard/google/trogdor/Kconfig
+++ b/src/mainboard/google/trogdor/Kconfig
@@ -8,20 +8,20 @@
    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_TROGDOR
+	select EC_GOOGLE_CHROMEEC_RTC if BOARD_GOOGLE_TROGDOR
+	select EC_GOOGLE_CHROMEEC_SPI if BOARD_GOOGLE_TROGDOR
+	select RTC if BOARD_GOOGLE_TROGDOR
    select SOC_QUALCOMM_SC7180
    select SPI_FLASH
    select SPI_FLASH_WINBOND
    select MAINBOARD_HAS_CHROMEOS

config VBOOT
-	select EC_GOOGLE_CHROMEEC_SWITCHES
+	select EC_GOOGLE_CHROMEEC_SWITCHES if BOARD_GOOGLE_TROGDOR
    select VBOOT_VBNV_FLASH
-	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
-	select VBOOT_MOCK_SECDATA
+	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC if BOARD_GOOGLE_BUBS
+	select VBOOT_MOCK_SECDATA if BOARD_GOOGLE_BUBS

config MAINBOARD_DIR
    string
@@ -46,5 +46,6 @@
 config MAINBOARD_PART_NUMBER
    string
    default "Trogdor" if BOARD_GOOGLE_TROGDOR
+	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 425c9bf..ba17254 100644
--- a/src/mainboard/google/trogdor/Kconfig.name
+++ b/src/mainboard/google/trogdor/Kconfig.name
@@ -1,4 +1,10 @@
+comment "Trogdor"

config BOARD_GOOGLE_TROGDOR
    bool "Trogdor"
    select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_BUBS
+	bool "Bubs"
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
diff --git a/src/mainboard/google/trogdor/reset.c b/src/mainboard/google/trogdor/reset.c
index 558f63d..f099dda 100644
--- a/src/mainboard/google/trogdor/reset.c
+++ b/src/mainboard/google/trogdor/reset.c
@@ -21,5 +21,6 @@
    but this works well enough for our purposes. */
 void do_board_reset(void)
 {
-	google_chromeec_reboot(0, EC_REBOOT_COLD, 0);
+	if (CONFIG(BOARD_GOOGLE_TROGDOR))
+		google_chromeec_reboot(0, EC_REBOOT_COLD, 0);
 }