From 2d7bb7e141127eccf5426b7998fa2dce0a186c33 Mon Sep 17 00:00:00 2001
From: Edward O'Callaghan <quasisec@google.com>
Date: Thu, 27 Feb 2020 15:27:31 +1100
Subject: [PATCH] src/ec,mainboard: Move weak smbios_system_sku() override
 inwards

Internalise smbios_system_sku() strong symbol inwards in the ec_skuid.c
implementation and simply wrap a call to:
google_chromeec_smbios_system_sku().

BUG=b:150735116
BRANCH=none
TEST=none

Change-Id: I05ebfc8126c0fb176ca52c307c658f50611ab6ab
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39146
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/ec/google/chromeec/ec_skuid.c             |  6 +++++
 src/mainboard/google/dedede/board_info.c      |  5 ----
 src/mainboard/google/hatch/mainboard.c        |  5 ----
 src/mainboard/google/octopus/Makefile.inc     |  1 -
 src/mainboard/google/octopus/mainboard_misc.c | 27 -------------------
 src/mainboard/google/volteer/mainboard.c      |  5 ----
 6 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 src/mainboard/google/octopus/mainboard_misc.c

diff --git a/src/ec/google/chromeec/ec_skuid.c b/src/ec/google/chromeec/ec_skuid.c
index f8fc203c47..ac69b136ee 100644
--- a/src/ec/google/chromeec/ec_skuid.c
+++ b/src/ec/google/chromeec/ec_skuid.c
@@ -11,6 +11,7 @@
 #include <ec/google/chromeec/ec.h>
 #include <console/console.h>
 #include <string.h>
+#include <smbios.h>
 
 #define SKU_UNKNOWN		0xFFFFFFFF
 
@@ -34,3 +35,8 @@ const char *google_chromeec_smbios_system_sku(void)
 	snprintf(sku_str, sizeof(sku_str), "sku%u", sku_id);
 	return sku_str;
 }
+
+const char *smbios_system_sku(void)
+{
+	return google_chromeec_smbios_system_sku();
+}
diff --git a/src/mainboard/google/dedede/board_info.c b/src/mainboard/google/dedede/board_info.c
index 7b10b23009..1d222b245d 100644
--- a/src/mainboard/google/dedede/board_info.c
+++ b/src/mainboard/google/dedede/board_info.c
@@ -12,11 +12,6 @@
 #include <smbios.h>
 #include <string.h>
 
-const char *smbios_system_sku(void)
-{
-	return google_chromeec_smbios_system_sku();
-}
-
 const char *smbios_mainboard_manufacturer(void)
 {
 	static char oem_name[32];
diff --git a/src/mainboard/google/hatch/mainboard.c b/src/mainboard/google/hatch/mainboard.c
index 888acf720f..e0e7a32456 100644
--- a/src/mainboard/google/hatch/mainboard.c
+++ b/src/mainboard/google/hatch/mainboard.c
@@ -21,11 +21,6 @@
 #include <string.h>
 #include <stdint.h>
 
-const char *smbios_system_sku(void)
-{
-	return google_chromeec_smbios_system_sku();
-}
-
 const char *smbios_mainboard_manufacturer(void)
 {
 	static char oem_name[32];
diff --git a/src/mainboard/google/octopus/Makefile.inc b/src/mainboard/google/octopus/Makefile.inc
index b8a7366f06..aa055246d2 100644
--- a/src/mainboard/google/octopus/Makefile.inc
+++ b/src/mainboard/google/octopus/Makefile.inc
@@ -5,7 +5,6 @@ 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
diff --git a/src/mainboard/google/octopus/mainboard_misc.c b/src/mainboard/google/octopus/mainboard_misc.c
deleted file mode 100644
index 8b281da9d0..0000000000
--- a/src/mainboard/google/octopus/mainboard_misc.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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>
-
-const char *smbios_system_sku(void)
-{
-	return google_chromeec_smbios_system_sku();
-}
diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c
index dcefb5d9cd..6ed928a76b 100644
--- a/src/mainboard/google/volteer/mainboard.c
+++ b/src/mainboard/google/volteer/mainboard.c
@@ -17,11 +17,6 @@
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <variant/gpio.h>
 
-const char *smbios_system_sku(void)
-{
-	return google_chromeec_smbios_system_sku();
-}
-
 static void mainboard_init(struct device *dev)
 {
 	mainboard_ec_init();