diff options
Diffstat (limited to 'src/soc/intel')
| -rw-r--r-- | src/soc/intel/baytrail/romstage/romstage.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/braswell/romstage/romstage.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/broadwell/pch/power_state.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/block/pmc/pmclib.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/quark/storage_test.c | 6 |
5 files changed, 6 insertions, 8 deletions
diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c index 74238e2721..658da2c44b 100644 --- a/src/soc/intel/baytrail/romstage/romstage.c +++ b/src/soc/intel/baytrail/romstage/romstage.c @@ -32,7 +32,7 @@ static void migrate_power_state(int is_recovery) } memcpy(ps_cbmem, ps_car, sizeof(*ps_cbmem)); } -ROMSTAGE_CBMEM_INIT_HOOK(migrate_power_state) +CBMEM_CREATION_HOOK(migrate_power_state); static struct chipset_power_state *fill_power_state(void) { diff --git a/src/soc/intel/braswell/romstage/romstage.c b/src/soc/intel/braswell/romstage/romstage.c index daa1b2d19f..a1623e13f9 100644 --- a/src/soc/intel/braswell/romstage/romstage.c +++ b/src/soc/intel/braswell/romstage/romstage.c @@ -26,7 +26,7 @@ static void migrate_power_state(int is_recovery) } memcpy(ps_cbmem, &power_state, sizeof(*ps_cbmem)); } -ROMSTAGE_CBMEM_INIT_HOOK(migrate_power_state); +CBMEM_CREATION_HOOK(migrate_power_state); struct chipset_power_state *fill_power_state(void) { diff --git a/src/soc/intel/broadwell/pch/power_state.c b/src/soc/intel/broadwell/pch/power_state.c index 12bee7d127..b1ab622b72 100644 --- a/src/soc/intel/broadwell/pch/power_state.c +++ b/src/soc/intel/broadwell/pch/power_state.c @@ -30,7 +30,7 @@ static void migrate_power_state(int is_recovery) } memcpy(ps_cbmem, ps_car, sizeof(*ps_cbmem)); } -ROMSTAGE_CBMEM_INIT_HOOK(migrate_power_state) +CBMEM_CREATION_HOOK(migrate_power_state); /* Return 0, 3, or 5 to indicate the previous sleep state. */ static int prev_sleep_state(const struct chipset_power_state *ps) diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c index 0f1da72577..bfe26c31ca 100644 --- a/src/soc/intel/common/block/pmc/pmclib.c +++ b/src/soc/intel/common/block/pmc/pmclib.c @@ -85,7 +85,7 @@ static void migrate_power_state(int is_recovery) } memcpy(ps_cbmem, &power_state, sizeof(*ps_cbmem)); } -ROMSTAGE_CBMEM_INIT_HOOK(migrate_power_state) +CBMEM_CREATION_HOOK(migrate_power_state); static void print_num_status_bits(int num_bits, uint32_t status, const char *const bit_names[]) 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); |