Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6028
-gerrit
commit 115f48b5d9ba2ea3ed2967d5ac7256f059c3319f Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Sun Jun 15 12:00:08 2014 +0300
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 --- src/mainboard/emulation/qemu-i440fx/Kconfig | 1 - .../emulation/qemu-i440fx/cache_as_ram.inc | 21 --------------------- src/mainboard/emulation/qemu-q35/Kconfig | 1 - 3 files changed, 23 deletions(-)
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig index 0a750df..f0c86d7 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 11ac91d..9e47473 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 674d890..aad0910 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