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

[Patrick Georgi (Code Review)]

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

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

mb/google/octopus: Override VBT selection for Bloog

Since most of Bloog series SKUs need to disable DRRS support.

If Bloog and Unprovisioned SKUs then return vbt.bin to enable DRRS support,
return vbt_blooguard.bin for other SKUs to disable DRRS support.

Bipship follow blooguard to disable DRRS support.

BUG=b:148892903, b:147021309
BRANCH=octopus
TEST=emerge-octopus coreboot chromeos-bootimage
     check i915_drrs_status shows DRRS supported NO when SKU ID is bipship.

Change-Id: I61f12d4ddea17a05255751fde2a5ce822dd2e782
Signed-off-by: Tony Huang 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38716
Tested-by: build bot (Jenkins) 
Reviewed-by: Marco Chen 
Reviewed-by: Karthik Ramasubramanian 
---
M src/mainboard/google/octopus/variants/bloog/variant.c
1 file changed, 25 insertions(+), 17 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Marco Chen: Looks good to me, but someone else must approve
  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 18f44b9..699385e 100644
--- a/src/mainboard/google/octopus/variants/bloog/variant.c
+++ b/src/mainboard/google/octopus/variants/bloog/variant.c
@@ -30,29 +30,34 @@
    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 */
+	SKU_53_BIPSHIP = 53, /* no kb blit, TS, 360, no Stylus, no rare-cam */
+	SKU_54_BIPSHIP = 54, /* kb blit, TS, 360, no Stylus, no rare-cam */
    SKU_65_BLOOGLET = 65, /* TS, kb blit */
    SKU_66_BLOOGLET = 66, /* TS, no kb blit */
    SKU_67_BLOOGLET = 67, /* non-TS, kb blit */
    SKU_68_BLOOGLET = 68, /* non-TS, no kb blit */
+	SKU_255_UNPROVISIONED = 255,
 };

const char *get_wifi_sar_cbfs_filename(void)
 {
    const char *filename = NULL;
-	uint32_t sku_id;
-	sku_id = get_board_sku();
+	uint32_t sku_id = get_board_sku();

-	if (sku_id == SKU_UNKNOWN)
-		return NULL;
-
-	if (sku_id == SKU_33_BLOOG || sku_id == SKU_34_BLOOG ||
-		sku_id == SKU_35_BLOOG || sku_id == SKU_36_BLOOG)
+	switch (sku_id) {
+	case SKU_33_BLOOG:
+	case SKU_34_BLOOG:
+	case SKU_35_BLOOG:
+	case SKU_36_BLOOG:
    	filename = "wifi_sar-bloog.hex";
-
-	if (sku_id == SKU_49_BLOOGUARD || sku_id == SKU_50_BLOOGUARD ||
-		sku_id == SKU_51_BLOOGUARD || sku_id == SKU_52_BLOOGUARD)
+		break;
+	case SKU_49_BLOOGUARD:
+	case SKU_50_BLOOGUARD:
+	case SKU_51_BLOOGUARD:
+	case SKU_52_BLOOGUARD:
    	filename = "wifi_sar-blooguard.hex";
-
+		break;
+	}
    return filename;
 }

@@ -62,11 +67,14 @@

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 ||
-		sku_id == SKU_65_BLOOGLET || sku_id == SKU_66_BLOOGLET ||
-		sku_id == SKU_67_BLOOGLET || sku_id == SKU_68_BLOOGLET)
+	switch (sku_id) {
+	case SKU_33_BLOOG:
+	case SKU_34_BLOOG:
+	case SKU_35_BLOOG:
+	case SKU_36_BLOOG:
+	case SKU_255_UNPROVISIONED:
+		return "vbt.bin";
+	default:
    	return "vbt_blooguard.bin";
-
-	return "vbt.bin";
+	}
 }