From 2d7bb7e141127eccf5426b7998fa2dce0a186c33 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Thu, 27 Feb 2020 15:27:31 +1100 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/39146 Reviewed-by: Karthik Ramasubramanian Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/mainboard/google/octopus/Makefile.inc | 1 - src/mainboard/google/octopus/mainboard_misc.c | 27 --------------------------- 2 files changed, 28 deletions(-) delete mode 100644 src/mainboard/google/octopus/mainboard_misc.c (limited to 'src/mainboard/google/octopus') 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 -#include -#include -#include -#include -#include -#include - -const char *smbios_system_sku(void) -{ - return google_chromeec_smbios_system_sku(); -} -- cgit v1.2.3