mb/google/hatch: Add VBTs for variants

Add VBTs for all hatch variants currently supported by
ChromeOS recovery images. For variants which use multiple
VBTs and select at runtime, ensure these are added directly
to CBFS.

Change-Id: I3c62ce204e3272e778ba0a34f7a47a65d8125f53
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59329
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
This commit is contained in:
Matt DeVillier 2021-11-15 19:57:16 -06:00 committed by Felix Held
parent f347166928
commit f9df79e8d6
21 changed files with 22 additions and 0 deletions

View File

@ -3,6 +3,7 @@ comment "Hatch"
config BOARD_GOOGLE_AKEMI config BOARD_GOOGLE_AKEMI
bool "-> Akemi (IdeaPad Flex 5/5i Chromebook)" bool "-> Akemi (IdeaPad Flex 5/5i Chromebook)"
select BOARD_GOOGLE_BASEBOARD_HATCH select BOARD_GOOGLE_BASEBOARD_HATCH
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_AMBASSADOR config BOARD_GOOGLE_AMBASSADOR
bool "-> Ambassador" bool "-> Ambassador"
@ -11,23 +12,28 @@ config BOARD_GOOGLE_AMBASSADOR
config BOARD_GOOGLE_DOOLY config BOARD_GOOGLE_DOOLY
bool "-> Dooly" bool "-> Dooly"
select BOARD_GOOGLE_BASEBOARD_PUFF select BOARD_GOOGLE_BASEBOARD_PUFF
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_DRATINI config BOARD_GOOGLE_DRATINI
bool "-> Dratini (HP Pro c640 Chromebook)" bool "-> Dratini (HP Pro c640 Chromebook)"
select BOARD_GOOGLE_BASEBOARD_HATCH select BOARD_GOOGLE_BASEBOARD_HATCH
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_DUFFY_LEGACY config BOARD_GOOGLE_DUFFY_LEGACY
bool "-> Duffy Legacy (32MB)" bool "-> Duffy Legacy (32MB)"
select BOARD_GOOGLE_BASEBOARD_PUFF select BOARD_GOOGLE_BASEBOARD_PUFF
select BOARD_ROMSIZE_KB_32768 select BOARD_ROMSIZE_KB_32768
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_DUFFY config BOARD_GOOGLE_DUFFY
bool "-> Duffy (ASUS Chromebox 4)" bool "-> Duffy (ASUS Chromebox 4)"
select BOARD_GOOGLE_BASEBOARD_PUFF select BOARD_GOOGLE_BASEBOARD_PUFF
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_FAFFY config BOARD_GOOGLE_FAFFY
bool "-> Faffy (ASUS Fanless Chromebox)" bool "-> Faffy (ASUS Fanless Chromebox)"
select BOARD_GOOGLE_BASEBOARD_PUFF select BOARD_GOOGLE_BASEBOARD_PUFF
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_GENESIS config BOARD_GOOGLE_GENESIS
bool "-> Genesis" bool "-> Genesis"
@ -37,41 +43,49 @@ config BOARD_GOOGLE_HATCH
bool "-> Hatch" bool "-> Hatch"
select BOARD_GOOGLE_BASEBOARD_HATCH select BOARD_GOOGLE_BASEBOARD_HATCH
select BOARD_ROMSIZE_KB_32768 select BOARD_ROMSIZE_KB_32768
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_HELIOS config BOARD_GOOGLE_HELIOS
bool "-> Helios (ASUS Chromebook Flip C436FA)" bool "-> Helios (ASUS Chromebook Flip C436FA)"
select BOARD_GOOGLE_BASEBOARD_HATCH select BOARD_GOOGLE_BASEBOARD_HATCH
select CHROMEOS_DSM_CALIB if CHROMEOS select CHROMEOS_DSM_CALIB if CHROMEOS
select DRIVERS_I2C_RT1011 select DRIVERS_I2C_RT1011
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_HELIOS_DISKSWAP config BOARD_GOOGLE_HELIOS_DISKSWAP
bool "-> Helios_Diskswap" bool "-> Helios_Diskswap"
select BOARD_GOOGLE_BASEBOARD_HATCH select BOARD_GOOGLE_BASEBOARD_HATCH
select CHROMEOS_DSM_CALIB if CHROMEOS select CHROMEOS_DSM_CALIB if CHROMEOS
select DRIVERS_I2C_RT1011 select DRIVERS_I2C_RT1011
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_JINLON config BOARD_GOOGLE_JINLON
bool "-> Jinlon (HP Elite c1030 Chromebook)" bool "-> Jinlon (HP Elite c1030 Chromebook)"
select BOARD_GOOGLE_BASEBOARD_HATCH select BOARD_GOOGLE_BASEBOARD_HATCH
select DRIVERS_GFX_GENERIC select DRIVERS_GFX_GENERIC
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_KAISA_LEGACY config BOARD_GOOGLE_KAISA_LEGACY
bool "-> Kaisa Legacy (32MB)" bool "-> Kaisa Legacy (32MB)"
select BOARD_GOOGLE_BASEBOARD_PUFF select BOARD_GOOGLE_BASEBOARD_PUFF
select BOARD_ROMSIZE_KB_32768 select BOARD_ROMSIZE_KB_32768
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_KAISA config BOARD_GOOGLE_KAISA
bool "-> Kaisa (Acer Chromebox CXI4)" bool "-> Kaisa (Acer Chromebox CXI4)"
select BOARD_GOOGLE_BASEBOARD_PUFF select BOARD_GOOGLE_BASEBOARD_PUFF
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_KINDRED config BOARD_GOOGLE_KINDRED
bool "-> Kindred (Acer Chromebook 712)" bool "-> Kindred (Acer Chromebook 712)"
select BOARD_GOOGLE_BASEBOARD_HATCH select BOARD_GOOGLE_BASEBOARD_HATCH
select INTEL_GMA_HAVE_VBT
select SOC_INTEL_COMMON_MMC_OVERRIDE select SOC_INTEL_COMMON_MMC_OVERRIDE
config BOARD_GOOGLE_KOHAKU config BOARD_GOOGLE_KOHAKU
bool "-> Kohaku (Samsung Galaxy Chromebook)" bool "-> Kohaku (Samsung Galaxy Chromebook)"
select BOARD_GOOGLE_BASEBOARD_HATCH select BOARD_GOOGLE_BASEBOARD_HATCH
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_MOONBUGGY config BOARD_GOOGLE_MOONBUGGY
bool "-> Moonbuggy" bool "-> Moonbuggy"
@ -86,10 +100,12 @@ config BOARD_GOOGLE_NIGHTFURY
select BOARD_GOOGLE_BASEBOARD_HATCH select BOARD_GOOGLE_BASEBOARD_HATCH
select CHROMEOS_DSM_CALIB if CHROMEOS select CHROMEOS_DSM_CALIB if CHROMEOS
select DRIVERS_I2C_MAX98390 select DRIVERS_I2C_MAX98390
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_NOIBAT config BOARD_GOOGLE_NOIBAT
bool "-> Noibat (HP Chromebox G3)" bool "-> Noibat (HP Chromebox G3)"
select BOARD_GOOGLE_BASEBOARD_PUFF select BOARD_GOOGLE_BASEBOARD_PUFF
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_PALKIA config BOARD_GOOGLE_PALKIA
bool "-> Palkia" bool "-> Palkia"
@ -101,6 +117,7 @@ config BOARD_GOOGLE_PUFF
bool "-> Puff" bool "-> Puff"
select BOARD_GOOGLE_BASEBOARD_PUFF select BOARD_GOOGLE_BASEBOARD_PUFF
select BOARD_ROMSIZE_KB_32768 select BOARD_ROMSIZE_KB_32768
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_SCOUT config BOARD_GOOGLE_SCOUT
bool "-> Scout" bool "-> Scout"
@ -113,3 +130,4 @@ config BOARD_GOOGLE_STRYKE
config BOARD_GOOGLE_WYVERN config BOARD_GOOGLE_WYVERN
bool "-> Wyvern (CTL Chromebox CBx2)" bool "-> Wyvern (CTL Chromebox CBx2)"
select BOARD_GOOGLE_BASEBOARD_PUFF select BOARD_GOOGLE_BASEBOARD_PUFF
select INTEL_GMA_HAVE_VBT

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -12,3 +12,5 @@ SPD_SOURCES += 16G_3200 # 0b111
bootblock-y += gpio.c bootblock-y += gpio.c
ramstage-y += gpio.c ramstage-y += gpio.c
ramstage-y += variant.c ramstage-y += variant.c
$(call add_vbt_to_cbfs, vbt-kled.bin, kled-data.vbt)

Binary file not shown.

Binary file not shown.

View File

@ -11,3 +11,5 @@ bootblock-y += gpio.c
ramstage-y += gpio.c ramstage-y += gpio.c
ramstage-y += ramstage.c ramstage-y += ramstage.c
ramstage-y += variant.c ramstage-y += variant.c
$(call add_vbt_to_cbfs, vbt-nightfury-qled.bin, nightfury-qled-data.vbt)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.