diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-17 14:13:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-17 14:13:16 -0400 |
| commit | ae1b939930b0fffc062bb99196ec22e19afcc7e8 (patch) | |
| tree | cc8d8c87b15932f82d5ed3c4e26bb118de949aff /arch/x86/lib/coreboot_table.c | |
| parent | a9f47426ced2e5057930990f3cd602b8ab936f69 (diff) | |
| parent | c2f17939f4b429c90a453e26927a7c578e5456b5 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib/coreboot_table.c')
| -rw-r--r-- | arch/x86/lib/coreboot_table.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c index ceab3cf5e4..b1b4cd9613 100644 --- a/arch/x86/lib/coreboot_table.c +++ b/arch/x86/lib/coreboot_table.c @@ -6,6 +6,7 @@ #include <common.h> #include <vbe.h> +#include <asm/acpi_s3.h> #include <asm/coreboot_tables.h> #include <asm/e820.h> @@ -19,7 +20,11 @@ int high_table_reserve(void) gd->arch.high_table_ptr = gd->start_addr_sp; /* clear the memory */ - memset((void *)gd->arch.high_table_ptr, 0, CONFIG_HIGH_TABLE_SIZE); +#ifdef CONFIG_HAVE_ACPI_RESUME + if (gd->arch.prev_sleep_state != ACPI_S3) +#endif + memset((void *)gd->arch.high_table_ptr, 0, + CONFIG_HIGH_TABLE_SIZE); gd->start_addr_sp &= ~0xf; |