Change in coreboot[master]: mb/google/octopus: Override VBT selection for Dorp/Vortininja/Vorticon

[Tony Huang (Code Review)]

Tony Huang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36259 )

Change subject: mb/google/octopus: Override VBT selection for Dorp/Vortininja/Vorticon
......................................................................

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 
---
M src/mainboard/google/octopus/variants/meep/include/variant/sku.h
M src/mainboard/google/octopus/variants/meep/variant.c
2 files changed, 9 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/36259/1

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 c12ba80..c3a18c4 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 @@
    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 ed76a29..20aaa0a 100644
--- a/src/mainboard/google/octopus/variants/meep/variant.c
+++ b/src/mainboard/google/octopus/variants/meep/variant.c
@@ -53,6 +53,13 @@
    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";
    }

[Justin TerAvest (Code Review)]

Justin TerAvest has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36259 )

Change subject: mb/google/octopus: Override VBT selection for Dorp/Vortininja/Vorticon
......................................................................

Patch Set 1: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36259 )

Change subject: mb/google/octopus: Override VBT selection for Dorp/Vortininja/Vorticon
......................................................................

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 
---
M src/mainboard/google/octopus/variants/meep/include/variant/sku.h
M src/mainboard/google/octopus/variants/meep/variant.c
2 files changed, 9 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Justin TerAvest: Looks good to me, approved

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 c12ba80..c3a18c4 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 @@
    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 ed76a29..20aaa0a 100644
--- a/src/mainboard/google/octopus/variants/meep/variant.c
+++ b/src/mainboard/google/octopus/variants/meep/variant.c
@@ -53,6 +53,13 @@
    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";
    }