4 files changed, 58 insertions, 32 deletions
diff --git a/src/mainboard/google/octopus/Makefile.inc b/src/mainboard/google/octopus/Makefile.inc
index aa055246d2..d36d5f7dbe 100644
--- a/src/mainboard/google/octopus/Makefile.inc
+++ b/src/mainboard/google/octopus/Makefile.inc
@@ -5,10 +5,12 @@ romstage-$(CONFIG_CHROMEOS) += chromeos.c
 
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
 ramstage-y += ec.c
+ramstage-y += mainboard_misc.c
 ramstage-y += mainboard.c
 
 verstage-$(CONFIG_CHROMEOS) += chromeos.c
 smm-y += smihandler.c
+smm-y += mainboard_misc.c
 
 subdirs-y += variants/baseboard
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c
index 3312d4d988..0ab4693bfc 100644
--- a/src/mainboard/google/octopus/mainboard.c
+++ b/src/mainboard/google/octopus/mainboard.c
@@ -117,38 +117,6 @@ struct chip_operations mainboard_ops = {
 	.enable_dev = mainboard_enable,
 };
 
-#define SKU_UNKNOWN		0xFFFFFFFF
-#define SKU_MAX			255
-
-uint32_t get_board_sku(void)
-{
-	static uint32_t sku_id = SKU_UNKNOWN;
-
-	if (sku_id != SKU_UNKNOWN)
-		return sku_id;
-
-	if (google_chromeec_cbi_get_sku_id(&sku_id))
-		sku_id = SKU_UNKNOWN;
-
-	return sku_id;
-}
-
-const char *smbios_system_sku(void)
-{
-	static char sku_str[7]; /* sku{0..255} */
-	uint32_t sku_id = get_board_sku();
-
-	if ((sku_id == SKU_UNKNOWN) || (sku_id > SKU_MAX)) {
-		printk(BIOS_ERR, "%s: Unexpected SKU ID %u\n",
-			__func__, sku_id);
-		return "";
-	}
-
-	snprintf(sku_str, sizeof(sku_str), "sku%u", sku_id);
-
-	return sku_str;
-}
-
 void __weak variant_update_devtree(struct device *dev)
 {
 	/* Place holder for common updates. */
diff --git a/src/mainboard/google/octopus/mainboard_misc.c b/src/mainboard/google/octopus/mainboard_misc.c
new file mode 100644
index 0000000000..3672f66692
--- /dev/null
+++ b/src/mainboard/google/octopus/mainboard_misc.c
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Intel Corp.
+ *
+ * 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 <baseboard/variants.h>
+#include <boardid.h>
+#include <console/console.h>
+#include <ec/google/chromeec/ec.h>
+#include <ec/ec.h>
+#include <smbios.h>
+#include <string.h>
+
+#define SKU_UNKNOWN		0xFFFFFFFF
+#define SKU_MAX			255
+
+uint32_t get_board_sku(void)
+{
+	static uint32_t sku_id = SKU_UNKNOWN;
+
+	if (sku_id != SKU_UNKNOWN)
+		return sku_id;
+
+	if (google_chromeec_cbi_get_sku_id(&sku_id))
+		sku_id = SKU_UNKNOWN;
+
+	return sku_id;
+}
+
+const char *smbios_system_sku(void)
+{
+	static char sku_str[7]; /* sku{0..255} */
+	uint32_t sku_id = get_board_sku();
+
+	if ((sku_id == SKU_UNKNOWN) || (sku_id > SKU_MAX)) {
+		printk(BIOS_ERR, "%s: Unexpected SKU ID %u\n",
+			__func__, sku_id);
+		return "";
+	}
+
+	snprintf(sku_str, sizeof(sku_str), "sku%u", sku_id);
+
+	return sku_str;
+}
diff --git a/src/mainboard/google/octopus/variants/bobba/Makefile.inc b/src/mainboard/google/octopus/variants/bobba/Makefile.inc
index ba865e9f82..7ee7e70d4b 100644
--- a/src/mainboard/google/octopus/variants/bobba/Makefile.inc
+++ b/src/mainboard/google/octopus/variants/bobba/Makefile.inc
@@ -2,3 +2,5 @@ bootblock-y += gpio.c
 
 ramstage-y += gpio.c
 ramstage-y += variant.c
+
+smm-y += variant.c