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

AMD cimx/sb800: Use acpi_is_wakeup_s3() 

Change-Id: If237c2fcd52f50d5fa0cad5a02a941386b085f2e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6077
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Kyösti Mälkki 2014-06-20 12:31:23 +03:00 committed by Patrick Georgi
parent 8ae16a44a4
commit c551caae56
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/northbridge/amd/agesa/family14/northbridge.c
View File

@ -761,17 +761,12 @@ static void domain_enable_resources(device_t dev)
u32 val; u32 val;
#if CONFIG_AMD_SB_CIMX #if CONFIG_AMD_SB_CIMX
#if CONFIG_HAVE_ACPI_RESUME if (!acpi_is_wakeup_s3()) {
if (acpi_slp_type != 3) {
sb_After_Pci_Init(); sb_After_Pci_Init();
sb_Mid_Post_Init(); sb_Mid_Post_Init();
} else { } else {
sb_After_Pci_Restore_Init(); sb_After_Pci_Restore_Init();
} }
#else
sb_After_Pci_Init();
sb_Mid_Post_Init();
#endif
#endif #endif
/* Must be called after PCI enumeration and resource allocation */ /* Must be called after PCI enumeration and resource allocation */

6
src/southbridge/amd/cimx/sb800/late.c
View File

@ -498,14 +498,10 @@ static void sb800_enable(device_t dev)
/* call the CIMX entry at the last sb800 device, /* call the CIMX entry at the last sb800 device,
* so make sure the mainboard devicetree is complete * so make sure the mainboard devicetree is complete
*/ */
#if CONFIG_HAVE_ACPI_RESUME if (!acpi_is_wakeup_s3())
if (acpi_slp_type != 3)
sb_Before_Pci_Init(); sb_Before_Pci_Init();
else else
sb_Before_Pci_Restore_Init(); sb_Before_Pci_Restore_Init();
#else
sb_Before_Pci_Init();
#endif
break; break;
default: default: