From 7cd2c073178b6d615199b439ad9a811cfb4dd820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 3 Jun 2018 23:04:28 +0300 Subject: ACPI S3: Depend on RELOCATABLE_RAMSTAGE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With RELOCATABLE_RAMSTAGE, S3 resume path only uses memory that is reserved from OS. So there is no need for low memory backup and recovery. Change-Id: If7f83711685ac445abf4cd1aa6b66c3391e0e554 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/26834 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans Reviewed-by: Aaron Durbin Reviewed-by: Angel Pons --- src/lib/prog_loaders.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/lib/prog_loaders.c') diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index dfabd31910..2ef6bdfc32 100644 --- a/src/lib/prog_loaders.c +++ b/src/lib/prog_loaders.c @@ -107,18 +107,6 @@ static int load_relocatable_ramstage(struct prog *ramstage) return rmodule_stage_load(&rmod_ram); } -static int load_nonrelocatable_ramstage(struct prog *ramstage) -{ - if (CONFIG(HAVE_ACPI_RESUME)) { - uintptr_t base = 0; - size_t size = cbfs_prog_stage_section(ramstage, &base); - if (size) - backup_ramstage_section(base, size); - } - - return cbfs_prog_stage_load(ramstage); -} - void run_ramstage(void) { struct prog ramstage = @@ -147,7 +135,7 @@ void run_ramstage(void) if (CONFIG(RELOCATABLE_RAMSTAGE)) { if (load_relocatable_ramstage(&ramstage)) goto fail; - } else if (load_nonrelocatable_ramstage(&ramstage)) + } else if (cbfs_prog_stage_load(&ramstage)) goto fail; stage_cache_add(STAGE_RAMSTAGE, &ramstage); -- cgit v1.2.3