8 files changed, 92 insertions, 5 deletions
diff --git a/src/mainboard/google/drallion/Makefile.inc b/src/mainboard/google/drallion/Makefile.inc
index ae8251e1d6..6f4f169f0e 100644
--- a/src/mainboard/google/drallion/Makefile.inc
+++ b/src/mainboard/google/drallion/Makefile.inc
@@ -16,7 +16,6 @@
 bootblock-y += bootblock.c
 
 ramstage-y += ramstage.c
-ramstage-y += sku.c
 
 romstage-y += romstage.c
 
diff --git a/src/mainboard/google/drallion/variants/arcada_cml/Makefile.inc b/src/mainboard/google/drallion/variants/arcada_cml/Makefile.inc
index 1cc010c3dd..b979be187e 100644
--- a/src/mainboard/google/drallion/variants/arcada_cml/Makefile.inc
+++ b/src/mainboard/google/drallion/variants/arcada_cml/Makefile.inc
@@ -20,3 +20,5 @@ bootblock-y += gpio.c
 ramstage-y += gpio.c
 romstage-y += gpio.c
 verstage-y += gpio.c
+
+ramstage-y += sku.c
diff --git a/src/mainboard/google/drallion/sku.c b/src/mainboard/google/drallion/variants/arcada_cml/sku.c
index d0b48f0572..d0b48f0572 100644
--- a/src/mainboard/google/drallion/sku.c
+++ b/src/mainboard/google/drallion/variants/arcada_cml/sku.c
diff --git a/src/mainboard/google/drallion/variants/drallion/Makefile.inc b/src/mainboard/google/drallion/variants/drallion/Makefile.inc
index 942d00b696..ef3d54d185 100644
--- a/src/mainboard/google/drallion/variants/drallion/Makefile.inc
+++ b/src/mainboard/google/drallion/variants/drallion/Makefile.inc
@@ -29,3 +29,5 @@ romstage-y += gpio.c
 verstage-y += gpio.c
 
 romstage-y += memory.c
+
+ramstage-y += sku.c
diff --git a/src/mainboard/google/drallion/variants/drallion/include/variant/variant.h b/src/mainboard/google/drallion/variants/drallion/include/variant/variant.h
index ca54580133..508654faa5 100644
--- a/src/mainboard/google/drallion/variants/drallion/include/variant/variant.h
+++ b/src/mainboard/google/drallion/variants/drallion/include/variant/variant.h
@@ -17,10 +17,21 @@
 #define VARIANT_H
 
 /* Need to update for Drallion with right SKU IDs*/
-#define VARIANT_SKU_ID			2
-#define VARIANT_SKU_NAME		"sku2"
-#define VARIANT_SKU_ID_SIGNED_EC	4
-#define VARIANT_SKU_NAME_SIGNED_EC	"sku4"
+typedef struct {
+	int id;
+	const char *name;
+} sku_info;
+
+const static sku_info skus[] = {
+	// Drallion 360
+	{ .id = 1, .name = "sku1" },
+	// Drallion
+	{ .id = 2, .name = "sku2" },
+	// Drallion 360 signed
+	{ .id = 3, .name = "sku3" },
+	// Drallion signed
+	{ .id = 4, .name = "sku4" },
+};
 
 /* Return memory SKU for the variant */
 int variant_memory_sku(void);
diff --git a/src/mainboard/google/drallion/variants/drallion/sku.c b/src/mainboard/google/drallion/variants/drallion/sku.c
new file mode 100644
index 0000000000..72776299b0
--- /dev/null
+++ b/src/mainboard/google/drallion/variants/drallion/sku.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 <boardid.h>
+#include <ec/google/wilco/commands.h>
+#include <smbios.h>
+#include <variant/variant.h>
+#include <gpio.h>
+#include <variant/gpio.h>
+
+static const uint32_t get_sku_index(void)
+{
+	return (gpio_get(SENSOR_DET_360) | (wilco_ec_signed_fw() << 1));
+}
+
+uint32_t sku_id(void)
+{
+	return skus[get_sku_index()].id;
+}
+
+const char *smbios_system_sku(void)
+{
+	return skus[get_sku_index()].name;
+}
diff --git a/src/mainboard/google/drallion/variants/sarien_cml/Makefile.inc b/src/mainboard/google/drallion/variants/sarien_cml/Makefile.inc
index 1cc010c3dd..b979be187e 100644
--- a/src/mainboard/google/drallion/variants/sarien_cml/Makefile.inc
+++ b/src/mainboard/google/drallion/variants/sarien_cml/Makefile.inc
@@ -20,3 +20,5 @@ bootblock-y += gpio.c
 ramstage-y += gpio.c
 romstage-y += gpio.c
 verstage-y += gpio.c
+
+ramstage-y += sku.c
diff --git a/src/mainboard/google/drallion/variants/sarien_cml/sku.c b/src/mainboard/google/drallion/variants/sarien_cml/sku.c
new file mode 100644
index 0000000000..d0b48f0572
--- /dev/null
+++ b/src/mainboard/google/drallion/variants/sarien_cml/sku.c
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 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 <boardid.h>
+#include <ec/google/wilco/commands.h>
+#include <smbios.h>
+#include <variant/variant.h>
+
+uint32_t sku_id(void)
+{
+	if (wilco_ec_signed_fw())
+		return VARIANT_SKU_ID_SIGNED_EC;
+	else
+		return VARIANT_SKU_ID;
+}
+
+const char *smbios_system_sku(void)
+{
+	if (wilco_ec_signed_fw())
+		return VARIANT_SKU_NAME_SIGNED_EC;
+	else
+		return VARIANT_SKU_NAME;
+}