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>
This commit is contained in:
T Michael Turney 2019-11-20 15:22:29 -08:00 committed by Julius Werner
parent 374d7c2e94
commit 14929253a5
4 changed files with 30 additions and 11 deletions

View File

@ -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

View File

@ -8,20 +8,23 @@ config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192
select COMMON_CBFS_SPI_WRAPPER select COMMON_CBFS_SPI_WRAPPER
select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC if !BOARD_GOOGLE_BUBS
select EC_GOOGLE_CHROMEEC_RTC select EC_GOOGLE_CHROMEEC_RTC if !BOARD_GOOGLE_BUBS
select EC_GOOGLE_CHROMEEC_SPI select EC_GOOGLE_CHROMEEC_SPI if !BOARD_GOOGLE_BUBS
select RTC select RTC if !BOARD_GOOGLE_BUBS
select MISSING_BOARD_RESET if BOARD_GOOGLE_BUBS
select SOC_QUALCOMM_SC7180 select SOC_QUALCOMM_SC7180
select SPI_FLASH select SPI_FLASH
select SPI_FLASH_WINBOND select SPI_FLASH_WINBOND
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_SPI_TPM_CR50 if !BOARD_GOOGLE_BUBS
select MAINBOARD_HAS_TPM2 if !BOARD_GOOGLE_BUBS
config VBOOT config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES select EC_GOOGLE_CHROMEEC_SWITCHES if !BOARD_GOOGLE_BUBS
select VBOOT_VBNV_FLASH select VBOOT_VBNV_FLASH
select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC select VBOOT_NO_BOARD_SUPPORT if BOARD_GOOGLE_BUBS
select VBOOT_MOCK_SECDATA select VBOOT_MOCK_SECDATA if BOARD_GOOGLE_BUBS
config MAINBOARD_DIR config MAINBOARD_DIR
string string
@ -29,11 +32,11 @@ config MAINBOARD_DIR
config DRIVER_TPM_SPI_BUS config DRIVER_TPM_SPI_BUS
hex hex
default 0x5 default 0x6
config EC_GOOGLE_CHROMEEC_SPI_BUS config EC_GOOGLE_CHROMEEC_SPI_BUS
hex hex
default 0xa default 0x0
########################################################## ##########################################################
#### Update below when adding a new derivative board. #### #### Update below when adding a new derivative board. ####
@ -43,5 +46,6 @@ config MAINBOARD_PART_NUMBER
string string
default "Trogdor" if BOARD_GOOGLE_TROGDOR default "Trogdor" if BOARD_GOOGLE_TROGDOR
default "Lazor" if BOARD_GOOGLE_LAZOR default "Lazor" if BOARD_GOOGLE_LAZOR
default "Bubs" if BOARD_GOOGLE_BUBS
endif # BOARD_GOOGLE_TROGDOR_COMMON endif # BOARD_GOOGLE_TROGDOR_COMMON

View File

@ -1,3 +1,4 @@
comment "Trogdor"
config BOARD_GOOGLE_TROGDOR config BOARD_GOOGLE_TROGDOR
bool "Trogdor" bool "Trogdor"
@ -6,3 +7,7 @@ config BOARD_GOOGLE_TROGDOR
config BOARD_GOOGLE_LAZOR config BOARD_GOOGLE_LAZOR
bool "Lazor" bool "Lazor"
select BOARD_GOOGLE_TROGDOR_COMMON select BOARD_GOOGLE_TROGDOR_COMMON
config BOARD_GOOGLE_BUBS
bool "Bubs"
select BOARD_GOOGLE_TROGDOR_COMMON

View File

@ -13,24 +13,26 @@
## ##
bootblock-y += memlayout.ld bootblock-y += memlayout.ld
bootblock-y += reset.c
bootblock-y += boardid.c bootblock-y += boardid.c
bootblock-y += chromeos.c bootblock-y += chromeos.c
bootblock-y += bootblock.c bootblock-y += bootblock.c
verstage-y += memlayout.ld verstage-y += memlayout.ld
ifneq ($(CONFIG_BOARD_GOOGLE_BUBS),y)
verstage-y += reset.c verstage-y += reset.c
endif
verstage-y += boardid.c verstage-y += boardid.c
verstage-y += chromeos.c verstage-y += chromeos.c
romstage-y += memlayout.ld romstage-y += memlayout.ld
romstage-y += romstage.c romstage-y += romstage.c
romstage-y += reset.c
romstage-y += boardid.c romstage-y += boardid.c
romstage-y += chromeos.c romstage-y += chromeos.c
ramstage-y += memlayout.ld ramstage-y += memlayout.ld
ramstage-y += mainboard.c ramstage-y += mainboard.c
ifneq ($(CONFIG_BOARD_GOOGLE_BUBS),y)
ramstage-y += reset.c ramstage-y += reset.c
endif
ramstage-y += chromeos.c ramstage-y += chromeos.c
ramstage-y += boardid.c ramstage-y += boardid.c