From ebd8a4f90cf58cd03a95fcc01acea1c59b0cad4e Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Wed, 1 Nov 2017 09:49:16 +0100 Subject: x86/smbios: Untangle system and board tables We were used to set the same values in the system and board tables. We'll keep the mainboard values as defaults for the system tables, so nothing changes unless somebody overrides the system table hooks. Change-Id: I3c9c95a1307529c3137647a161a698a4c3daa0ae Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/c/coreboot/+/29477 Tested-by: build bot (Jenkins) Reviewed-by: Richard Spiegel Reviewed-by: HAOUAS Elyes --- src/mainboard/google/poppy/variants/nami/mainboard.c | 2 +- src/mainboard/google/poppy/variants/nautilus/mainboard.c | 2 +- src/mainboard/google/poppy/variants/rammus/mainboard.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mainboard/google/poppy/variants') diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c index e279693511..836c97ea40 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -104,7 +104,7 @@ uint32_t variant_board_sku(void) return sku_id; } -const char *smbios_mainboard_sku(void) +const char *smbios_system_sku(void) { static char sku_str[14]; /* sku{0..4294967295} */ diff --git a/src/mainboard/google/poppy/variants/nautilus/mainboard.c b/src/mainboard/google/poppy/variants/nautilus/mainboard.c index 08fb73f932..6d9f2e99a9 100644 --- a/src/mainboard/google/poppy/variants/nautilus/mainboard.c +++ b/src/mainboard/google/poppy/variants/nautilus/mainboard.c @@ -28,7 +28,7 @@ #define B_PCH_OC_WDT_CTL_EN BIT14 #define B_PCH_OC_WDT_CTL_UNXP_RESET_STS BIT22 -const char *smbios_mainboard_sku(void) +const char *smbios_system_sku(void) { static char sku_str[5]; /* sku{0-1} */ diff --git a/src/mainboard/google/poppy/variants/rammus/mainboard.c b/src/mainboard/google/poppy/variants/rammus/mainboard.c index a3474d4666..5c5b258885 100644 --- a/src/mainboard/google/poppy/variants/rammus/mainboard.c +++ b/src/mainboard/google/poppy/variants/rammus/mainboard.c @@ -34,7 +34,7 @@ uint32_t variant_board_sku(void) return sku_id; } -const char *smbios_mainboard_sku(void) +const char *smbios_system_sku(void) { static char sku_str[14]; /* sku{0..4294967295} */ -- cgit v1.2.3