From f9df79e8d6a63c91552a7256e655e15eecc01c48 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Mon, 15 Nov 2021 19:57:16 -0600 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/59329 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- src/mainboard/google/hatch/Kconfig.name | 18 ++++++++++++++++++ src/mainboard/google/hatch/variants/akemi/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/hatch/variants/dooly/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/hatch/variants/dratini/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/hatch/variants/duffy/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/hatch/variants/faffy/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/hatch/variants/hatch/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/hatch/variants/helios/data.vbt | Bin 0 -> 4608 bytes .../google/hatch/variants/helios_diskswap/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/hatch/variants/jinlon/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/hatch/variants/kaisa/data.vbt | Bin 0 -> 4608 bytes .../google/hatch/variants/kindred/Makefile.inc | 2 ++ src/mainboard/google/hatch/variants/kindred/data.vbt | Bin 0 -> 4608 bytes .../google/hatch/variants/kindred/kled-data.vbt | Bin 0 -> 4612 bytes src/mainboard/google/hatch/variants/kohaku/data.vbt | Bin 0 -> 4608 bytes .../google/hatch/variants/nightfury/Makefile.inc | 2 ++ .../google/hatch/variants/nightfury/data.vbt | Bin 0 -> 4608 bytes .../hatch/variants/nightfury/nightfury-qled-data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/hatch/variants/noibat/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/hatch/variants/puff/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/hatch/variants/wyvern/data.vbt | Bin 0 -> 4608 bytes 21 files changed, 22 insertions(+) create mode 100644 src/mainboard/google/hatch/variants/akemi/data.vbt create mode 100644 src/mainboard/google/hatch/variants/dooly/data.vbt create mode 100644 src/mainboard/google/hatch/variants/dratini/data.vbt create mode 100644 src/mainboard/google/hatch/variants/duffy/data.vbt create mode 100644 src/mainboard/google/hatch/variants/faffy/data.vbt create mode 100644 src/mainboard/google/hatch/variants/hatch/data.vbt create mode 100644 src/mainboard/google/hatch/variants/helios/data.vbt create mode 100644 src/mainboard/google/hatch/variants/helios_diskswap/data.vbt create mode 100644 src/mainboard/google/hatch/variants/jinlon/data.vbt create mode 100644 src/mainboard/google/hatch/variants/kaisa/data.vbt create mode 100644 src/mainboard/google/hatch/variants/kindred/data.vbt create mode 100644 src/mainboard/google/hatch/variants/kindred/kled-data.vbt create mode 100644 src/mainboard/google/hatch/variants/kohaku/data.vbt create mode 100644 src/mainboard/google/hatch/variants/nightfury/data.vbt create mode 100644 src/mainboard/google/hatch/variants/nightfury/nightfury-qled-data.vbt create mode 100644 src/mainboard/google/hatch/variants/noibat/data.vbt create mode 100644 src/mainboard/google/hatch/variants/puff/data.vbt create mode 100644 src/mainboard/google/hatch/variants/wyvern/data.vbt (limited to 'src') diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name index be69a54731..59e2b69228 100644 --- a/src/mainboard/google/hatch/Kconfig.name +++ b/src/mainboard/google/hatch/Kconfig.name @@ -3,6 +3,7 @@ comment "Hatch" config BOARD_GOOGLE_AKEMI bool "-> Akemi (IdeaPad Flex 5/5i Chromebook)" select BOARD_GOOGLE_BASEBOARD_HATCH + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_AMBASSADOR bool "-> Ambassador" @@ -11,23 +12,28 @@ config BOARD_GOOGLE_AMBASSADOR config BOARD_GOOGLE_DOOLY bool "-> Dooly" select BOARD_GOOGLE_BASEBOARD_PUFF + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_DRATINI bool "-> Dratini (HP Pro c640 Chromebook)" select BOARD_GOOGLE_BASEBOARD_HATCH + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_DUFFY_LEGACY bool "-> Duffy Legacy (32MB)" select BOARD_GOOGLE_BASEBOARD_PUFF select BOARD_ROMSIZE_KB_32768 + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_DUFFY bool "-> Duffy (ASUS Chromebox 4)" select BOARD_GOOGLE_BASEBOARD_PUFF + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_FAFFY bool "-> Faffy (ASUS Fanless Chromebox)" select BOARD_GOOGLE_BASEBOARD_PUFF + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_GENESIS bool "-> Genesis" @@ -37,41 +43,49 @@ config BOARD_GOOGLE_HATCH bool "-> Hatch" select BOARD_GOOGLE_BASEBOARD_HATCH select BOARD_ROMSIZE_KB_32768 + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_HELIOS bool "-> Helios (ASUS Chromebook Flip C436FA)" select BOARD_GOOGLE_BASEBOARD_HATCH select CHROMEOS_DSM_CALIB if CHROMEOS select DRIVERS_I2C_RT1011 + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_HELIOS_DISKSWAP bool "-> Helios_Diskswap" select BOARD_GOOGLE_BASEBOARD_HATCH select CHROMEOS_DSM_CALIB if CHROMEOS select DRIVERS_I2C_RT1011 + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_JINLON bool "-> Jinlon (HP Elite c1030 Chromebook)" select BOARD_GOOGLE_BASEBOARD_HATCH select DRIVERS_GFX_GENERIC + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_KAISA_LEGACY bool "-> Kaisa Legacy (32MB)" select BOARD_GOOGLE_BASEBOARD_PUFF select BOARD_ROMSIZE_KB_32768 + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_KAISA bool "-> Kaisa (Acer Chromebox CXI4)" select BOARD_GOOGLE_BASEBOARD_PUFF + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_KINDRED bool "-> Kindred (Acer Chromebook 712)" select BOARD_GOOGLE_BASEBOARD_HATCH + select INTEL_GMA_HAVE_VBT select SOC_INTEL_COMMON_MMC_OVERRIDE config BOARD_GOOGLE_KOHAKU bool "-> Kohaku (Samsung Galaxy Chromebook)" select BOARD_GOOGLE_BASEBOARD_HATCH + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_MOONBUGGY bool "-> Moonbuggy" @@ -86,10 +100,12 @@ config BOARD_GOOGLE_NIGHTFURY select BOARD_GOOGLE_BASEBOARD_HATCH select CHROMEOS_DSM_CALIB if CHROMEOS select DRIVERS_I2C_MAX98390 + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_NOIBAT bool "-> Noibat (HP Chromebox G3)" select BOARD_GOOGLE_BASEBOARD_PUFF + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_PALKIA bool "-> Palkia" @@ -101,6 +117,7 @@ config BOARD_GOOGLE_PUFF bool "-> Puff" select BOARD_GOOGLE_BASEBOARD_PUFF select BOARD_ROMSIZE_KB_32768 + select INTEL_GMA_HAVE_VBT config BOARD_GOOGLE_SCOUT bool "-> Scout" @@ -113,3 +130,4 @@ config BOARD_GOOGLE_STRYKE config BOARD_GOOGLE_WYVERN bool "-> Wyvern (CTL Chromebox CBx2)" select BOARD_GOOGLE_BASEBOARD_PUFF + select INTEL_GMA_HAVE_VBT diff --git a/src/mainboard/google/hatch/variants/akemi/data.vbt b/src/mainboard/google/hatch/variants/akemi/data.vbt new file mode 100644 index 0000000000..a972fa230a Binary files /dev/null and b/src/mainboard/google/hatch/variants/akemi/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/dooly/data.vbt b/src/mainboard/google/hatch/variants/dooly/data.vbt new file mode 100644 index 0000000000..42fc269659 Binary files /dev/null and b/src/mainboard/google/hatch/variants/dooly/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/dratini/data.vbt b/src/mainboard/google/hatch/variants/dratini/data.vbt new file mode 100644 index 0000000000..a8a028ca64 Binary files /dev/null and b/src/mainboard/google/hatch/variants/dratini/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/duffy/data.vbt b/src/mainboard/google/hatch/variants/duffy/data.vbt new file mode 100644 index 0000000000..cda1c25d7d Binary files /dev/null and b/src/mainboard/google/hatch/variants/duffy/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/faffy/data.vbt b/src/mainboard/google/hatch/variants/faffy/data.vbt new file mode 100644 index 0000000000..cda1c25d7d Binary files /dev/null and b/src/mainboard/google/hatch/variants/faffy/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/hatch/data.vbt b/src/mainboard/google/hatch/variants/hatch/data.vbt new file mode 100644 index 0000000000..72ef31592a Binary files /dev/null and b/src/mainboard/google/hatch/variants/hatch/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/helios/data.vbt b/src/mainboard/google/hatch/variants/helios/data.vbt new file mode 100644 index 0000000000..a972fa230a Binary files /dev/null and b/src/mainboard/google/hatch/variants/helios/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/helios_diskswap/data.vbt b/src/mainboard/google/hatch/variants/helios_diskswap/data.vbt new file mode 100644 index 0000000000..a972fa230a Binary files /dev/null and b/src/mainboard/google/hatch/variants/helios_diskswap/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/jinlon/data.vbt b/src/mainboard/google/hatch/variants/jinlon/data.vbt new file mode 100644 index 0000000000..a8a028ca64 Binary files /dev/null and b/src/mainboard/google/hatch/variants/jinlon/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/kaisa/data.vbt b/src/mainboard/google/hatch/variants/kaisa/data.vbt new file mode 100644 index 0000000000..cda1c25d7d Binary files /dev/null and b/src/mainboard/google/hatch/variants/kaisa/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/kindred/Makefile.inc b/src/mainboard/google/hatch/variants/kindred/Makefile.inc index 1676fd9798..767e119dbc 100644 --- a/src/mainboard/google/hatch/variants/kindred/Makefile.inc +++ b/src/mainboard/google/hatch/variants/kindred/Makefile.inc @@ -12,3 +12,5 @@ SPD_SOURCES += 16G_3200 # 0b111 bootblock-y += gpio.c ramstage-y += gpio.c ramstage-y += variant.c + +$(call add_vbt_to_cbfs, vbt-kled.bin, kled-data.vbt) diff --git a/src/mainboard/google/hatch/variants/kindred/data.vbt b/src/mainboard/google/hatch/variants/kindred/data.vbt new file mode 100644 index 0000000000..a972fa230a Binary files /dev/null and b/src/mainboard/google/hatch/variants/kindred/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/kindred/kled-data.vbt b/src/mainboard/google/hatch/variants/kindred/kled-data.vbt new file mode 100644 index 0000000000..f07cb69c06 Binary files /dev/null and b/src/mainboard/google/hatch/variants/kindred/kled-data.vbt differ diff --git a/src/mainboard/google/hatch/variants/kohaku/data.vbt b/src/mainboard/google/hatch/variants/kohaku/data.vbt new file mode 100644 index 0000000000..31fcd1e3d8 Binary files /dev/null and b/src/mainboard/google/hatch/variants/kohaku/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/nightfury/Makefile.inc b/src/mainboard/google/hatch/variants/nightfury/Makefile.inc index c0a68a889d..a856f44082 100644 --- a/src/mainboard/google/hatch/variants/nightfury/Makefile.inc +++ b/src/mainboard/google/hatch/variants/nightfury/Makefile.inc @@ -11,3 +11,5 @@ bootblock-y += gpio.c ramstage-y += gpio.c ramstage-y += ramstage.c ramstage-y += variant.c + +$(call add_vbt_to_cbfs, vbt-nightfury-qled.bin, nightfury-qled-data.vbt) diff --git a/src/mainboard/google/hatch/variants/nightfury/data.vbt b/src/mainboard/google/hatch/variants/nightfury/data.vbt new file mode 100644 index 0000000000..31fcd1e3d8 Binary files /dev/null and b/src/mainboard/google/hatch/variants/nightfury/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/nightfury/nightfury-qled-data.vbt b/src/mainboard/google/hatch/variants/nightfury/nightfury-qled-data.vbt new file mode 100644 index 0000000000..a972fa230a Binary files /dev/null and b/src/mainboard/google/hatch/variants/nightfury/nightfury-qled-data.vbt differ diff --git a/src/mainboard/google/hatch/variants/noibat/data.vbt b/src/mainboard/google/hatch/variants/noibat/data.vbt new file mode 100644 index 0000000000..cda1c25d7d Binary files /dev/null and b/src/mainboard/google/hatch/variants/noibat/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/puff/data.vbt b/src/mainboard/google/hatch/variants/puff/data.vbt new file mode 100644 index 0000000000..cda1c25d7d Binary files /dev/null and b/src/mainboard/google/hatch/variants/puff/data.vbt differ diff --git a/src/mainboard/google/hatch/variants/wyvern/data.vbt b/src/mainboard/google/hatch/variants/wyvern/data.vbt new file mode 100644 index 0000000000..cda1c25d7d Binary files /dev/null and b/src/mainboard/google/hatch/variants/wyvern/data.vbt differ -- cgit v1.2.3