UPSTREAM: 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.
Change-Id: Iea7ad7e2d651e9d1a50de0892f87913f10bba498
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 469af0348e2e61112ee98007d41aaaa43135a776
Original-Cq-Depend: chrome-internal:1983227
Original-Change-Id: I36a313fd2beacb878da7383f733e206067c1c0fb
Original-Signed-off-by: Tony Huang <tony-huang@quanta.corp-partner.google.com>
Original-Reviewed-on: https://review.coreboot.org/c/coreboot/+/36015
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/1865242
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Commit-Queue: Patrick Georgi <pgeorgi@chromium.org>
(cherry picked from commit 2e9772fdfa2cccce953f6e6d5489b8a955c893ae)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/1866109
Reviewed-by: Marco Chen <marcochen@chromium.org>
Commit-Queue: Marco Chen <marcochen@chromium.org>
Tested-by: Marco Chen <marcochen@chromium.org>
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";
+}
