[coreboot-gerrit] Change in coreboot[master]: mb/google/octopus: Override VBT selection for Blooguard

[Patrick Georgi (Code Review)]

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

Change subject: mb/google/octopus: Override VBT selection for Blooguard
......................................................................

mb/google/octopus: Override VBT selection for Blooguard

Disable DRRS on Blooguard SKU - 49, 50, 51, 52

BUG=b:142632381
BRANCH=octopus
TEST=emerge-octopus coreboot chromeos-bootimage
     check i915_drrs_status shows DRRS supported NO when SKU ID is blooguard.

Cq-Depend: chrome-internal:1983227
Change-Id: I36a313fd2beacb878da7383f733e206067c1c0fb
Signed-off-by: Tony Huang 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36015
Tested-by: build bot (Jenkins) 
Reviewed-by: Karthik Ramasubramanian 
---
M src/mainboard/google/octopus/variants/bloog/variant.c
1 file changed, 29 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Karthik Ramasubramanian: Looks good to me, approved

diff --git a/src/mainboard/google/octopus/variants/bloog/variant.c b/src/mainboard/google/octopus/variants/bloog/variant.c
index 6484080..4bbaa8e 100644
--- a/src/mainboard/google/octopus/variants/bloog/variant.c
+++ b/src/mainboard/google/octopus/variants/bloog/variant.c
@@ -17,9 +17,21 @@
 #include <ec/google/chromeec/ec.h>
 #include <sar.h>
 #include <baseboard/variants.h>
+#include <drivers/intel/gma/opregion.h>

#define SKU_UNKNOWN     0xFFFFFFFF

+enum {
+	SKU_33_BLOOG = 33, /* no kb blit, USI Stylus */
+	SKU_34_BLOOG = 34, /* kb blit, no USI Stylus */
+	SKU_35_BLOOG = 35, /* kb blit, USI Stylus */
+	SKU_36_BLOOG = 36, /* no kb blit, no USI Stylus */
+	SKU_49_BLOOGUARD = 49, /* kb blit, no USI Stylus */
+	SKU_50_BLOOGUARD = 50, /* kb blit, USI Stylus */
+	SKU_51_BLOOGUARD = 51, /* no kb blit, no USI Stylus */
+	SKU_52_BLOOGUARD = 52, /* no kb blit, USI Stylus */
+};
+
 const char *get_wifi_sar_cbfs_filename(void)
 {
    const char *filename = NULL;
@@ -29,11 +41,26 @@
    if (sku_id == SKU_UNKNOWN)
    	return NULL;

-	if (sku_id == 33 || sku_id == 34 || sku_id == 35 || sku_id == 36)
+	if (sku_id == SKU_33_BLOOG || sku_id == SKU_34_BLOOG ||
+		sku_id == SKU_35_BLOOG || sku_id == SKU_36_BLOOG)
    	filename = "wifi_sar-bloog.hex";

-	if (sku_id == 49 || sku_id == 50 || sku_id == 51 || sku_id == 52)
+	if (sku_id == SKU_49_BLOOGUARD || sku_id == SKU_50_BLOOGUARD ||
+		sku_id == SKU_51_BLOOGUARD || sku_id == SKU_52_BLOOGUARD)
    	filename = "wifi_sar-blooguard.hex";

return filename;
 }
+
+const char *mainboard_vbt_filename(void)
+{
+	uint32_t sku_id;
+
+	sku_id = get_board_sku();
+
+	if (sku_id == SKU_49_BLOOGUARD || sku_id == SKU_50_BLOOGUARD ||
+		sku_id == SKU_51_BLOOGUARD || sku_id == SKU_52_BLOOGUARD)
+		return "vbt_blooguard.bin";
+
+	return "vbt.bin";
+}