From f4543e7426213651f61dc7e31b989bc3ddb67ed3 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Wed, 6 Apr 2022 20:40:35 +0200 Subject: arch/x86/acpi_bert_storage.c: Use BOOT_STATE over CBMEM hooks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the purpose of linking ramstage inside the bootblock we likely want to skip some ramstage CBMEM hooks and keep those only for recovering data from earlier stages. Change-Id: I317173d468073906d76228d1c8cc7bc28aae9e75 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/63415 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki Reviewed-by: Angel Pons Reviewed-by: Tim Wawrzynczak Reviewed-by: Felix Held --- src/arch/x86/acpi_bert_storage.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/arch') diff --git a/src/arch/x86/acpi_bert_storage.c b/src/arch/x86/acpi_bert_storage.c index 8559c06dfb..7b6b63bcca 100644 --- a/src/arch/x86/acpi_bert_storage.c +++ b/src/arch/x86/acpi_bert_storage.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include #include #include #include @@ -577,7 +578,7 @@ __weak void bert_reserved_region(void **start, size_t *size) *size = 0; } -static void bert_storage_setup(int unused) +static void bert_storage_setup(void *unused) { /* Always start with a blank bert region. Make sure nothing is * maintained across reboots or resumes. @@ -596,4 +597,4 @@ static void bert_storage_setup(int unused) memset(bert_region_base, 0, bert_region_size); } -RAMSTAGE_CBMEM_INIT_HOOK(bert_storage_setup) +BOOT_STATE_INIT_ENTRY(BS_PRE_DEVICE, BS_ON_EXIT, bert_storage_setup, NULL); -- cgit v1.2.3