ec/google/chromeec: add smbios_mainboard_manufacturer()

When EC_GOOGLE_CHROMEEC_SKUID is selected provide an
implementation of smbios_mainboard_manufacturer() so the code
doesn't need to be duplicated in the mainboards.

BUG=b:153767369

Change-Id: Ib65fe373a79d606cffcba71882b0db61be5a18c3
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40317
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>

4 files changed, 19 insertions, 67 deletions

diff --git a/src/ec/google/chromeec/ec_skuid.c b/src/ec/google/chromeec/ec_skuid.c
index 51229758e6..a64d3f9678 100644
--- a/src/ec/google/chromeec/ec_skuid.c
+++ b/src/ec/google/chromeec/ec_skuid.c
@@ -37,3 +37,22 @@ const char *smbios_system_sku(void)
 {
 	return google_chromeec_smbios_system_sku();
 }
+
+const char *smbios_mainboard_manufacturer(void)
+{
+	static char oem_name[32];
+	static const char *manuf;
+
+	if (manuf)
+		return manuf;
+
+	if (google_chromeec_cbi_get_oem_name(&oem_name[0],
+			ARRAY_SIZE(oem_name)) < 0) {
+		printk(BIOS_ERR, "Couldn't obtain OEM name from CBI\n");
+		manuf = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER;
+	} else {
+		manuf = &oem_name[0];
+	}
+
+	return manuf;
+}
diff --git a/src/mainboard/google/dedede/board_info.c b/src/mainboard/google/dedede/board_info.c
index d49ae9692a..1d1e069372 100644
--- a/src/mainboard/google/dedede/board_info.c
+++ b/src/mainboard/google/dedede/board_info.c
@@ -11,25 +11,6 @@
 #include <smbios.h>
 #include <string.h>
 
-const char *smbios_mainboard_manufacturer(void)
-{
-	static char oem_name[32];
-	static const char *manuf;
-
-	if (manuf)
-		return manuf;
-
-	if (google_chromeec_cbi_get_oem_name(&oem_name[0],
-			ARRAY_SIZE(oem_name)) < 0) {
-		printk(BIOS_ERR, "Couldn't obtain OEM name from CBI\n");
-		manuf = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER;
-	} else {
-		manuf = &oem_name[0];
-	}
-
-	return manuf;
-}
-
 int board_info_get_fw_config(uint32_t *fw_config)
 {
 	return google_chromeec_cbi_get_fw_config(fw_config);
diff --git a/src/mainboard/google/hatch/mainboard.c b/src/mainboard/google/hatch/mainboard.c
deleted file mode 100644
index 73c3456eec..0000000000
--- a/src/mainboard/google/hatch/mainboard.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/* This file is part of the coreboot project. */
-
-#include <baseboard/variants.h>
-#include <boardid.h>
-#include <console/console.h>
-#include <ec/google/chromeec/ec.h>
-#include <smbios.h>
-#include <string.h>
-#include <stdint.h>
-
-const char *smbios_mainboard_manufacturer(void)
-{
-	static char oem_name[32];
-	static const char *manuf;
-
-	if (manuf)
-		return manuf;
-
-	if (google_chromeec_cbi_get_oem_name(&oem_name[0],
-				ARRAY_SIZE(oem_name)) < 0) {
-		printk(BIOS_INFO, "Couldn't obtain OEM name from CBI\n");
-		manuf = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER;
-	} else {
-		manuf = &oem_name[0];
-	}
-
-	return manuf;
-}
diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c
index e0040f3fb2..00ede2cf60 100644
--- a/src/mainboard/google/octopus/mainboard.c
+++ b/src/mainboard/google/octopus/mainboard.c
@@ -139,25 +139,6 @@ void mainboard_devtree_update(struct device *dev)
 	variant_update_devtree(dev);
 }
 
-const char *smbios_mainboard_manufacturer(void)
-{
-	static char oem_name[32];
-	static const char *manuf;
-
-	if (manuf)
-		return manuf;
-
-	if (google_chromeec_cbi_get_oem_name(&oem_name[0],
-			ARRAY_SIZE(oem_name)) < 0) {
-		printk(BIOS_ERR, "Couldn't obtain OEM name from CBI\n");
-		manuf = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER;
-	} else {
-		manuf = &oem_name[0];
-	}
-
-	return manuf;
-}
-
 bool __weak variant_ext_usb_status(unsigned int port_type, unsigned int port_id)
 {
 	/* All externally visible USB ports are present */