diff options
| author | T Michael Turney <mturney@codeaurora.org> | 2019-11-20 15:22:29 -0800 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2020-04-15 19:57:59 +0000 |
| commit | 14929253a52cebaedbbe918972ea12568e29dfd9 (patch) | |
| tree | 16445377244bf643e2ff3b1f33757679950af15d /src/mainboard | |
| parent | 374d7c2e94ce4bc8520368ee0f0aa9d0e44a56ca (diff) | |
trogdor: add support for Bubs variant
Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984
Signed-off-by: T Michael Turney <mturney@codeaurora.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37069
Reviewed-by: Bob Moragues <moragues@google.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/google/trogdor/Kconfig | 22 | ||||
| -rw-r--r-- | src/mainboard/google/trogdor/Kconfig.name | 5 | ||||
| -rw-r--r-- | src/mainboard/google/trogdor/Makefile.inc | 6 |
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 |