summaryrefslogtreecommitdiff
path: root/src/soc/intel/quark/storage_test.c
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2022-03-31 07:40:10 +0300
committerArthur Heymans <arthur@aheymans.xyz>2022-05-20 07:15:39 +0000
commitfa3bc049f5ca51eeb35fafb61f043d5a54f30c14 (patch)
treee362832abc5cc3895e6bb61986111a18b240410f /src/soc/intel/quark/storage_test.c
parent20a87c0bed98fe8817a2dfccf4cd271199aabc1a (diff)
CBMEM: Change declarations for initialization hooks
There are efforts to have bootflows that do not follow a traditional bootblock-romstage-postcar-ramstage model. As part of that CBMEM initialisation hooks will need to move from romstage to bootblock. The interface towards platforms and drivers will change to use one of CBMEM_CREATION_HOOK() or CBMEM_READY_HOOK(). Former will only be called in the first stage with CBMEM available. Change-Id: Ie24bf4e818ca69f539196c3a814f3c52d4103d7e Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/63375 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Raul Rangel <rrangel@chromium.org>
Diffstat (limited to 'src/soc/intel/quark/storage_test.c')
-rw-r--r--src/soc/intel/quark/storage_test.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/soc/intel/quark/storage_test.c b/src/soc/intel/quark/storage_test.c
index 04c673616d..f15d295a61 100644
--- a/src/soc/intel/quark/storage_test.c
+++ b/src/soc/intel/quark/storage_test.c
@@ -159,7 +159,7 @@ void storage_test(uint32_t bar, int full_initialization)
/* Get the structure addresses */
media = NULL;
- if (ENV_ROMSTAGE)
+ if (ENV_CREATES_CBMEM)
media = (struct storage_media *)drivers_storage;
else
media = cbmem_find(CBMEM_ID_STORAGE_DATA);
@@ -225,7 +225,6 @@ void storage_test(uint32_t bar, int full_initialization)
}
#endif
-#if ENV_ROMSTAGE
static void copy_storage_structures(int is_recovery)
{
struct storage_media *media;
@@ -242,5 +241,4 @@ static void copy_storage_structures(int is_recovery)
media->ctrlr = &sdhci_ctrlr->sd_mmc_ctrlr;
}
-ROMSTAGE_CBMEM_INIT_HOOK(copy_storage_structures);
-#endif
+CBMEM_CREATION_HOOK(copy_storage_structures);