From f3180f07b55dfe29938d2883d9a98a529fe9ef1a Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 6 Jul 2023 16:36:41 +0200 Subject: soc/amd/*/globalnvs,nvs: remove deprecated & unused CBMC field from GNVS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit cde4f3b2790d ("acpi/gnvs.c: Drop unused pointer to the cbmem console") removed writing the coreboot memory console pointer to the GNVS and kept the CBMC field as reserved. Since those fields aren't needed any more and there are no dependencies on the absolute position of the different fields in GNVS as long as both GNVS definitions on the C and the ASL side match, remove the deprecated and unused CBMC field from the GNVS structs. Signed-off-by: Felix Held Change-Id: Iadfaf5a4ec1401b027dbfb6a7c6ce74a1dcecdfa Reviewed-on: https://review.coreboot.org/c/coreboot/+/76351 Reviewed-by: Kyösti Mälkki Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier Reviewed-by: Elyes Haouas --- src/soc/amd/mendocino/include/soc/nvs.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/soc/amd/mendocino/include') diff --git a/src/soc/amd/mendocino/include/soc/nvs.h b/src/soc/amd/mendocino/include/soc/nvs.h index 3d50e084d9..f93d590ebc 100644 --- a/src/soc/amd/mendocino/include/soc/nvs.h +++ b/src/soc/amd/mendocino/include/soc/nvs.h @@ -13,9 +13,8 @@ struct __packed global_nvs { /* Miscellaneous */ - uint32_t unused_was_cbmc; /* 0x00 - 0x03 - coreboot Memory Console */ - uint64_t pm1i; /* 0x04 - 0x0b - System Wake Source - PM1 Index */ - uint64_t gpei; /* 0x0c - 0x13 - GPE Wake Source */ + uint64_t pm1i; /* 0x00 - 0x07 - System Wake Source - PM1 Index */ + uint64_t gpei; /* 0x08 - 0x0f - GPE Wake Source */ }; #endif /* AMD_MENDOCINO_NVS_H */ -- cgit v1.2.3