summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cpu/amd/car/post_cache_as_ram.c12
-rw-r--r--src/mainboard/asus/kcma-d8/romstage.c2
-rw-r--r--src/mainboard/asus/kgpe-d16/romstage.c2
3 files changed, 1 insertions, 15 deletions
diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c
index ad93883def..2fb46d286a 100644
--- a/src/cpu/amd/car/post_cache_as_ram.c
+++ b/src/cpu/amd/car/post_cache_as_ram.c
@@ -136,17 +136,7 @@ asmlinkage void * post_cache_as_ram(void)
if ((*lower_stack_boundary) != 0xdeadbeef)
printk(BIOS_WARNING, "BSP overran lower stack boundary. Undefined behaviour may result!\n");
- if (IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)) {
- s3resume = acpi_is_wakeup_s3();
- } else {
- if (IS_ENABLED(CONFIG_HAVE_ACPI_RESUME))
- s3resume = (acpi_get_sleep_type() == ACPI_S3);
- /* For normal boot path, boards with LATE_CBMEM_INIT will do
- * cbmem_initialize_empty() late in ramstage.
- */
- if (s3resume)
- cbmem_recovery(s3resume);
- }
+ s3resume = acpi_is_wakeup_s3();
prepare_romstage_ramstack(s3resume);
diff --git a/src/mainboard/asus/kcma-d8/romstage.c b/src/mainboard/asus/kcma-d8/romstage.c
index a14f7e38d0..02dd671e8d 100644
--- a/src/mainboard/asus/kcma-d8/romstage.c
+++ b/src/mainboard/asus/kcma-d8/romstage.c
@@ -561,7 +561,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
execute_memory_test();
#endif
-#if !IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
if (s3resume)
cbmem_initialize();
else
@@ -571,7 +570,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
romstage_handoff_init(s3resume);
amdmct_cbmem_store_info(sysinfo);
-#endif
printk(BIOS_DEBUG, "disable_spd()\n");
switch_spd_mux(0x1);
diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c
index 9f3e7310fb..7f640cd2f7 100644
--- a/src/mainboard/asus/kgpe-d16/romstage.c
+++ b/src/mainboard/asus/kgpe-d16/romstage.c
@@ -602,7 +602,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
execute_memory_test();
#endif
-#if !IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
if (s3resume)
cbmem_initialize();
else
@@ -613,7 +612,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
post_code(0x41);
amdmct_cbmem_store_info(sysinfo);
-#endif
printk(BIOS_DEBUG, "disable_spd()\n");
switch_spd_mux(0x1);