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

[Furquan Shaikh (Code Review)]

Furquan Shaikh has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34512 )

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

mb/google/octopus: Override VBT selection for Dorp

For dorp HDMI sku, select VBT which enables HDMI output.

-sku33 (HDMI)
-sku34 (HDMI + keyboard backlight)
-sku35 (HDMI + Touchscreen)
-sku36 (HDMI + keyboard backlight + Touchscreen)

Cq-Depend: chrome-internal:1502253
BUG=b:136522841
BRANCH=octopus
TEST=emerge-octopus coreboot

Change-Id: I62262378f85bb899073ffac7804be876e649e429
Signed-off-by: Wisley Chen 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34512
Tested-by: build bot (Jenkins) 
Reviewed-by: Marco Chen 
Reviewed-by: Justin TerAvest 
---
M src/mainboard/google/octopus/variants/meep/Makefile.inc
A src/mainboard/google/octopus/variants/meep/variant.c
2 files changed, 37 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Justin TerAvest: Looks good to me, approved
  Marco Chen: Looks good to me, but someone else must approve

diff --git a/src/mainboard/google/octopus/variants/meep/Makefile.inc b/src/mainboard/google/octopus/variants/meep/Makefile.inc
index 9fb63f5..ba865e9 100644
--- a/src/mainboard/google/octopus/variants/meep/Makefile.inc
+++ b/src/mainboard/google/octopus/variants/meep/Makefile.inc
@@ -1,3 +1,4 @@
 bootblock-y += gpio.c

ramstage-y += gpio.c
+ramstage-y += variant.c
diff --git a/src/mainboard/google/octopus/variants/meep/variant.c b/src/mainboard/google/octopus/variants/meep/variant.c
new file mode 100644
index 0000000..71e6eb4
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/meep/variant.c
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <ec/google/chromeec/ec.h>
+#include <drivers/intel/gma/opregion.h>
+#include <baseboard/variants.h>
+#include <variant/sku.h>
+
+const char *mainboard_vbt_filename(void)
+{
+	uint32_t sku_id;
+
+	sku_id = get_board_sku();
+
+	switch (sku_id) {
+	case SKU_33_DORP:
+	case SKU_34_DORP:
+	case SKU_35_DORP:
+	case SKU_36_DORP:
+		return "vbt_dorp_hdmi.bin";
+	default:
+		return "vbt.bin";
+	}
+}