GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amdfam10: Drop tests for LATE_CBMEM_INIT 

Change-Id: Ibe16242d98531ff8e8a696f571496c6f46ea964b
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/26809
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Kyösti Mälkki 2018-06-03 06:53:30 +03:00
parent 56dd2d26b5
commit e0e1e64855
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpu/amd/car/post_cache_as_ram.c
View File

@ -136,17 +136,7 @@ asmlinkage void * post_cache_as_ram(void)
if ((*lower_stack_boundary) != 0xdeadbeef) if ((*lower_stack_boundary) != 0xdeadbeef)
printk(BIOS_WARNING, "BSP overran lower stack boundary. Undefined behaviour may result!\n"); 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(); 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);
}
prepare_romstage_ramstack(s3resume); prepare_romstage_ramstack(s3resume);

2
src/mainboard/asus/kcma-d8/romstage.c
View File

@ -561,7 +561,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
execute_memory_test(); execute_memory_test();
#endif #endif
#if !IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
if (s3resume) if (s3resume)
cbmem_initialize(); cbmem_initialize();
else else
@ -571,7 +570,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
romstage_handoff_init(s3resume); romstage_handoff_init(s3resume);
amdmct_cbmem_store_info(sysinfo); amdmct_cbmem_store_info(sysinfo);
#endif
printk(BIOS_DEBUG, "disable_spd()\n"); printk(BIOS_DEBUG, "disable_spd()\n");
switch_spd_mux(0x1); switch_spd_mux(0x1);

2
src/mainboard/asus/kgpe-d16/romstage.c
View File

@ -602,7 +602,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
execute_memory_test(); execute_memory_test();
#endif #endif
#if !IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
if (s3resume) if (s3resume)
cbmem_initialize(); cbmem_initialize();
else else
@ -613,7 +612,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
post_code(0x41); post_code(0x41);
amdmct_cbmem_store_info(sysinfo); amdmct_cbmem_store_info(sysinfo);
#endif
printk(BIOS_DEBUG, "disable_spd()\n"); printk(BIOS_DEBUG, "disable_spd()\n");
switch_spd_mux(0x1); switch_spd_mux(0x1);