From 746241f114e851623d2031959a99b06a5102708b Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Mon, 4 Sep 2017 19:22:26 +0300 Subject: ACPI S3: Remove conflicting local acpi_get_sleep_type() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We now require EARLY_CBMEM_INIT and romstage_handoff to support HAVE_ACPI_RESUME. Thus acpi_handoff_wakeup() would never call an externally defined acpi_get_sleep_type(). Name _sleep_type() was also inapproriate here, as it referred to hardware-dependent SLP_TYP field of PM1CNT but still returned ACPI_Sx value instead. Change-Id: I8dc130f1e86dd7e96922d546f0ae9713188336cd Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/21397 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Subrata Banik --- src/southbridge/amd/agesa/hudson/ramtop.c | 4 ---- src/southbridge/amd/cimx/sb800/ramtop.c | 4 ---- 2 files changed, 8 deletions(-) (limited to 'src/southbridge/amd') diff --git a/src/southbridge/amd/agesa/hudson/ramtop.c b/src/southbridge/amd/agesa/hudson/ramtop.c index 34cf74ebd2..22b291d1bb 100644 --- a/src/southbridge/amd/agesa/hudson/ramtop.c +++ b/src/southbridge/amd/agesa/hudson/ramtop.c @@ -19,8 +19,6 @@ #include #include "hudson.h" -#if !ENV_RAMSTAGE || IS_ENABLED(CONFIG_LATE_CBMEM_INIT) - int acpi_get_sleep_type(void) { u16 tmp = inw(ACPI_PM1_CNT_BLK); @@ -28,8 +26,6 @@ int acpi_get_sleep_type(void) return (int)tmp; } -#endif - void backup_top_of_low_cacheable(uintptr_t ramtop) { u32 dword = ramtop; diff --git a/src/southbridge/amd/cimx/sb800/ramtop.c b/src/southbridge/amd/cimx/sb800/ramtop.c index 2281f83958..3c685767bc 100644 --- a/src/southbridge/amd/cimx/sb800/ramtop.c +++ b/src/southbridge/amd/cimx/sb800/ramtop.c @@ -19,8 +19,6 @@ #include #include "SBPLATFORM.h" -#if !ENV_RAMSTAGE || IS_ENABLED(CONFIG_LATE_CBMEM_INIT) - int acpi_get_sleep_type(void) { u16 tmp = inw(PM1_CNT_BLK_ADDRESS); @@ -28,8 +26,6 @@ int acpi_get_sleep_type(void) return (int)tmp; } -#endif - void backup_top_of_low_cacheable(uintptr_t ramtop) { u32 dword = ramtop; -- cgit v1.2.3