diff options
| author | Shelley Chen <shchen@google.com> | 2021-06-24 15:23:26 -0700 |
|---|---|---|
| committer | Shelley Chen <shchen@google.com> | 2021-06-29 16:37:35 +0000 |
| commit | 8790b9a0830ed38c9f2766309f2d415dbff72a63 (patch) | |
| tree | 6eff9e703108911c04c50df632801b8a2418278d | |
| parent | 56731154a6095eb04d1e0d153bff535479a05f88 (diff) | |
mb/google/herobrine: Add Senor and Piglin variants
Add configs for Herobrine variants. Also enable ec sw sync as this
should not be disabled by default.
BUG=b:182963902
BRANCH=None
TEST=./util/abuild/abuild -p none -t GOOGLE_SENOR -x -a -B
./util/abuild/abuild -p none -t GOOGLE_PIGLIN -x -a -B
Change-Id: Ide4e375aa0236dce65a954a2f68455d05fa841eb
Signed-off-by: Shelley Chen <shchen@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55829
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | src/mainboard/google/herobrine/Kconfig | 19 | ||||
| -rw-r--r-- | src/mainboard/google/herobrine/Kconfig.name | 8 | ||||
| -rw-r--r-- | src/mainboard/google/herobrine/Makefile.inc | 3 |
3 files changed, 22 insertions, 8 deletions
diff --git a/src/mainboard/google/herobrine/Kconfig b/src/mainboard/google/herobrine/Kconfig index 01212d6c87..7f88b94f5c 100644 --- a/src/mainboard/google/herobrine/Kconfig +++ b/src/mainboard/google/herobrine/Kconfig @@ -7,21 +7,24 @@ 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_SENOR + select EC_GOOGLE_CHROMEEC_RTC if !BOARD_GOOGLE_SENOR + select EC_GOOGLE_CHROMEEC_SPI if !BOARD_GOOGLE_SENOR + select RTC if !BOARD_GOOGLE_SENOR + select MISSING_BOARD_RESET if BOARD_GOOGLE_SENOR select SOC_QUALCOMM_SC7280 select SPI_FLASH select SPI_FLASH_WINBOND select SPI_FLASH_MACRONIX select MAINBOARD_HAS_CHROMEOS + select MAINBOARD_HAS_SPI_TPM_CR50 if !BOARD_GOOGLE_SENOR + select MAINBOARD_HAS_TPM2 if !BOARD_GOOGLE_SENOR config VBOOT - select EC_GOOGLE_CHROMEEC_SWITCHES + select EC_GOOGLE_CHROMEEC_SWITCHES if !BOARD_GOOGLE_SENOR select VBOOT_VBNV_FLASH - select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC - select VBOOT_MOCK_SECDATA + select VBOOT_NO_BOARD_SUPPORT if BOARD_GOOGLE_SENOR + select VBOOT_MOCK_SECDATA if BOARD_GOOGLE_SENOR config MAINBOARD_DIR string @@ -39,5 +42,7 @@ config MAINBOARD_VENDOR config MAINBOARD_PART_NUMBER string default "Herobrine" if BOARD_GOOGLE_HEROBRINE + default "Senor" if BOARD_GOOGLE_SENOR + default "Piglin" if BOARD_GOOGLE_PIGLIN endif # BOARD_GOOGLE_HEROBRINE_COMMON diff --git a/src/mainboard/google/herobrine/Kconfig.name b/src/mainboard/google/herobrine/Kconfig.name index 51d102ac35..ed2ce5c3f7 100644 --- a/src/mainboard/google/herobrine/Kconfig.name +++ b/src/mainboard/google/herobrine/Kconfig.name @@ -6,6 +6,14 @@ config BOARD_GOOGLE_HEROBRINE bool "-> Herobrine" select BOARD_GOOGLE_HEROBRINE_COMMON +config BOARD_GOOGLE_SENOR + bool "-> Senor" + select BOARD_GOOGLE_HEROBRINE_COMMON + +config BOARD_GOOGLE_PIGLIN + bool "-> Piglin" + select BOARD_GOOGLE_HEROBRINE_COMMON + endif comment "(Herobrine requires 'Allow QC blobs repository')" diff --git a/src/mainboard/google/herobrine/Makefile.inc b/src/mainboard/google/herobrine/Makefile.inc index 553634c29c..11a396ff04 100644 --- a/src/mainboard/google/herobrine/Makefile.inc +++ b/src/mainboard/google/herobrine/Makefile.inc @@ -2,8 +2,9 @@ all-y += boardid.c all-y += chromeos.c +ifneq ($(CONFIG_BOARD_GOOGLE_SENOR),y) all-y += reset.c - +endif bootblock-y += bootblock.c romstage-y += romstage.c |