summaryrefslogtreecommitdiff
path: root/src/soc/amd
diff options
context:
space:
mode:
authorBill XIE <persmule@hardenedlinux.org>2020-02-24 23:08:35 +0800
committerPhilipp Deppenwiese <zaolin.daisuki@gmail.com>2020-03-31 10:38:07 +0000
commit516c0a53384188f00b5df139b0840567dc8b8298 (patch)
tree787842ee7a72df3211f3497eb2a2ec370b7c8c13 /src/soc/amd
parentbad08c2c29210530e584436a562a1c03a68eb693 (diff)
security/vboot: relocate and rename vboot_platform_is_resuming()
After measured boot is decoupled from verified boot in CB:35077, vboot_platform_is_resuming() is never vboot-specific, thus it is renamed to platform_is_resuming() and declared in bootmode.h. Change-Id: I29b5b88af0576c34c10cfbd99659a5cdc0c75842 Signed-off-by: Bill XIE <persmule@hardenedlinux.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39103 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/soc/amd')
-rw-r--r--src/soc/amd/common/block/acpi/acpi.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/soc/amd/common/block/acpi/acpi.c b/src/soc/amd/common/block/acpi/acpi.c
index 6f2f7c5ad7..4d99f7b535 100644
--- a/src/soc/amd/common/block/acpi/acpi.c
+++ b/src/soc/amd/common/block/acpi/acpi.c
@@ -12,15 +12,17 @@
* GNU General Public License for more details.
*/
+#include <amdblocks/acpimmio.h>
+#include <amdblocks/acpi.h>
#include <arch/acpi.h>
+#include <bootmode.h>
#include <cbmem.h>
-#include <elog.h>
#include <console/console.h>
-#include <soc/southbridge.h>
-#include <amdblocks/acpimmio.h>
-#include <amdblocks/acpi.h>
+#include <elog.h>
#include <halt.h>
#include <security/vboot/vboot_common.h>
+#include <soc/southbridge.h>
+#include <halt.h>
void poweroff(void)
{
@@ -136,7 +138,7 @@ int acpi_get_sleep_type(void)
return acpi_sleep_from_pm1(acpi_read16(MMIO_ACPI_PM1_CNT_BLK));
}
-int vboot_platform_is_resuming(void)
+int platform_is_resuming(void)
{
if (!(acpi_read16(MMIO_ACPI_PM1_STS) & WAK_STS))
return 0;