From 81e3b74301042b014d3698396c47f61e06dfcb6d Mon Sep 17 00:00:00 2001 From: Tony Huang Date: Wed, 23 Oct 2019 20:02:47 +0800 Subject: [PATCH] mb/google/octopus: Override VBT selection for Dorp/Vortininja/Vorticon Add enum for Vorticon sku. Vortininja/Vorticon will load vbt_vortininja.bin Dorp will load vbt_dorp.bin BUG=b:143197918 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage check i915_drrs_status shows DRRS supported NO when SKU-ID sets to Dorp/Vortininja/Vorticon. Change-Id: I67d7a8ab62a1838b0a0a05f532d8b067ece686d9 Cq-Depend: chrome-internal:2026287 Signed-off-by: Tony Huang Reviewed-on: https://review.coreboot.org/c/coreboot/+/36259 Tested-by: build bot (Jenkins) Reviewed-by: Justin TerAvest --- .../google/octopus/variants/meep/include/variant/sku.h | 2 ++ src/mainboard/google/octopus/variants/meep/variant.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/src/mainboard/google/octopus/variants/meep/include/variant/sku.h b/src/mainboard/google/octopus/variants/meep/include/variant/sku.h index c12ba80302..c3a18c4452 100644 --- a/src/mainboard/google/octopus/variants/meep/include/variant/sku.h +++ b/src/mainboard/google/octopus/variants/meep/include/variant/sku.h @@ -29,6 +29,8 @@ enum { SKU_50_VORTININJA = 50, /* Stylus + no rear camera */ SKU_51_VORTININJA = 51, /* no Stylus + rear camera */ SKU_52_VORTININJA = 52, /* no Stylus + no rear camera */ + SKU_65_VORTICON = 65, /* no touchscreen */ + SKU_66_VORTICON = 66, /* with touchscreen */ }; diff --git a/src/mainboard/google/octopus/variants/meep/variant.c b/src/mainboard/google/octopus/variants/meep/variant.c index ed76a29298..20aaa0a1f4 100644 --- a/src/mainboard/google/octopus/variants/meep/variant.c +++ b/src/mainboard/google/octopus/variants/meep/variant.c @@ -53,6 +53,13 @@ const char *mainboard_vbt_filename(void) case SKU_35_DORP: case SKU_36_DORP: return "vbt_dorp_hdmi.bin"; + case SKU_49_VORTININJA: + case SKU_50_VORTININJA: + case SKU_51_VORTININJA: + case SKU_52_VORTININJA: + case SKU_65_VORTICON: + case SKU_66_VORTICON: + return "vbt_vortininja.bin"; default: return "vbt.bin"; }