diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-06-15 12:00:08 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-06-18 20:30:45 +0200 |
| commit | aac45febc78c2e3254fc6ed58ad8b81ce59bbf26 (patch) | |
| tree | 0deb05d7dae50691858a9e7d19ca169b80c2675e /src/mainboard/emulation | |
| parent | a1e924ca6b5c8ce84625ac525db117391e5f872f (diff) | |
emulation/x86 : Drop HAVE_ACPI_RESUME
S3 resume detection not implemented in romstage.c.
Change-Id: I98277cb483825af2e6c5c8eefa4598b117613478
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6028
Tested-by: build bot (Jenkins)
Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'src/mainboard/emulation')
| -rw-r--r-- | src/mainboard/emulation/qemu-i440fx/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc | 21 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-q35/Kconfig | 1 |
3 files changed, 0 insertions, 23 deletions
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig index 0a750df425..f0c86d75cd 100644 --- a/src/mainboard/emulation/qemu-i440fx/Kconfig +++ b/src/mainboard/emulation/qemu-i440fx/Kconfig @@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_ACPI_TABLES - select HAVE_ACPI_RESUME select BOARD_ROMSIZE_KB_256 select EARLY_CBMEM_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT diff --git a/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc b/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc index 11ac91d049..9e47473d4b 100644 --- a/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc +++ b/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc @@ -59,27 +59,6 @@ before_romstage: post_code(0x30) -#if CONFIG_HAVE_ACPI_RESUME - movl CBMEM_BOOT_MODE, %eax - cmpl $0x2, %eax // Resume? - jne __acpi_resume_backup_done - - /* copy 1MB - 64K to high tables ram_base to prevent memory corruption - * through stage 2. We could keep stuff like stack and heap in high - * tables memory completely, but that's a wonderful clean up task for - * another day. - */ - cld - movl $CONFIG_RAMBASE, %esi - movl CBMEM_RESUME_BACKUP, %edi - movl $HIGH_MEMORY_SAVE / 4, %ecx - rep movsl - -__acpi_resume_backup_done: -#endif - - post_code(0x3d) - __main: post_code(POST_PREPARE_RAMSTAGE) cld /* Clear direction flag. */ diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig index 674d890286..aad0910ad4 100644 --- a/src/mainboard/emulation/qemu-q35/Kconfig +++ b/src/mainboard/emulation/qemu-q35/Kconfig @@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy # select HAVE_OPTION_TABLE # select HAVE_PIRQ_TABLE select HAVE_ACPI_TABLES -# select HAVE_ACPI_RESUME select BOARD_ROMSIZE_KB_256 select EARLY_CBMEM_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT |