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/3995
-gerrit
commit acb6e27d0fa74cff327b45262c264ad2fdef0dd3 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Sun Oct 13 20:41:57 2013 +0300
roda/rk9: Remove unused HAVE_ACPI_RESUME
Change-Id: I154f1a97bc1102af80310d9820aa2bd3042ee681 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/mainboard/roda/rk9/Kconfig | 1 - src/mainboard/roda/rk9/romstage.c | 19 ------------------- 2 files changed, 20 deletions(-)
diff --git a/src/mainboard/roda/rk9/Kconfig b/src/mainboard/roda/rk9/Kconfig index 59ae455..54caba7 100644 --- a/src/mainboard/roda/rk9/Kconfig +++ b/src/mainboard/roda/rk9/Kconfig @@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_MP_TABLE select CARDBUS_PLUGIN_SUPPORT select HAVE_ACPI_TABLES - #select HAVE_ACPI_RESUME select EC_ACPI select HAVE_OPTION_TABLE
diff --git a/src/mainboard/roda/rk9/romstage.c b/src/mainboard/roda/rk9/romstage.c index 075790d..79d19e0 100644 --- a/src/mainboard/roda/rk9/romstage.c +++ b/src/mainboard/roda/rk9/romstage.c @@ -183,25 +183,6 @@ void main(unsigned long bist)
init_iommu();
-#if CONFIG_HAVE_ACPI_RESUME - /* If there is no high memory area, we didn't boot before, so - * this is not a resume. In that case we just create the cbmem toc. - */ - if (s3resume && cbmem_reinit() { - void *resume_backup_memory = cbmem_find(CBMEM_ID_RESUME); - - /* 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. - */ - if (resume_backup_memory) - memcpy(resume_backup_memory, (void *)CONFIG_RAMBASE, HIGH_MEMORY_SAVE); - - /* Magic for S3 resume */ - pci_write_config32(PCI_DEV(0, 0, 0), D0F0_SKPD, SKPAD_ACPI_S3_MAGIC); - } -#endif printk(BIOS_SPEW, "exit main()\n"); }
-
Kyösti Mälkki