From 37eb24be1585a76b293999df43e9a83af7d7ba09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Mon, 11 Jan 2021 18:40:37 +0200 Subject: ACPI: Clean up GNVS initialisation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the common approach platform does not need to implement the common accessors or sizeof() function. Change-Id: I1050a252f765c763c1ae2d1610cbfb0d973ba026 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/49793 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/include/acpi/acpi_gnvs.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/include') diff --git a/src/include/acpi/acpi_gnvs.h b/src/include/acpi/acpi_gnvs.h index c0e8aed526..936a922827 100644 --- a/src/include/acpi/acpi_gnvs.h +++ b/src/include/acpi/acpi_gnvs.h @@ -5,22 +5,22 @@ #include +void acpi_create_gnvs(void); +#if CONFIG(ACPI_SOC_NVS) void *acpi_get_gnvs(void); -void *gnvs_get_or_create(void); +#else +static inline void *acpi_get_gnvs(void) { return NULL; } +#endif void gnvs_assign_chromeos(void *gnvs_section); void gnvs_set_ecfw_rw(void); -/* Platform code must implement these. */ -struct global_nvs; -size_t gnvs_size_of_array(void); -uint32_t *gnvs_cbmc_ptr(struct global_nvs *gnvs); - /* * These functions populate the gnvs structure in acpi table. * Defined as weak in common acpi as gnvs structure definition is * chipset specific. */ +struct global_nvs; void soc_fill_gnvs(struct global_nvs *gnvs); void mainboard_fill_gnvs(struct global_nvs *gnvs); -- cgit v1.2.3