[coreboot-gerrit] Patch set updated for coreboot: ACPI S3: Flip ACPI_HUGE_LOWMEM_BACKUP default

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17358

-gerrit

commit 1a0471c69455beb04aae11d33443e44826bbe9d9
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Thu Nov 10 11:50:21 2016 +0200

    ACPI S3: Flip ACPI_HUGE_LOWMEM_BACKUP default
    
    Except fo nehalem, K8, f10 and f15 (non-AGESA) romstage ramstack
    is placed in CBMEM and ramstage loader takes care of tiny backup.
    
    Change-Id: I8477944f48ed2493d0a5e436a4088eb9fc3d59c5
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/Kconfig                               | 9 +--------
 src/cpu/amd/agesa/Kconfig                 | 1 -
 src/cpu/amd/family_10h-family_15h/Kconfig | 1 +
 src/cpu/amd/model_fxx/Kconfig             | 1 +
 src/cpu/amd/pi/Kconfig                    | 1 -
 src/northbridge/intel/nehalem/Kconfig     | 1 +
 6 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/Kconfig b/src/Kconfig
index a22a2b3..436964c 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -556,16 +556,9 @@ config HAVE_ACPI_RESUME
 	bool
 	default n
 
-config ACPI_TINY_LOWMEM_BACKUP
-	bool
-	default n
-	help
-	  On S3 resume path, backup only the region of low memory ramstage
-	  will occupy. Requires platform places romstage ramstack in CBMEM.
-
 config ACPI_HUGE_LOWMEM_BACKUP
 	bool
-	default !ACPI_TINY_LOWMEM_BACKUP
+	default n
 	help
 	  On S3 resume path, backup low memory from RAMBASE..RAMTOP in CBMEM.
 
diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
index 7fe24ce..ae5e854 100644
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -31,7 +31,6 @@ config CPU_AMD_AGESA
 	select UDELAY_LAPIC
 	select LAPIC_MONOTONIC_TIMER
 	select SPI_FLASH if HAVE_ACPI_RESUME
-	select ACPI_TINY_LOWMEM_BACKUP
 
 if CPU_AMD_AGESA
 
diff --git a/src/cpu/amd/family_10h-family_15h/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig
index 95338df..8e90247 100644
--- a/src/cpu/amd/family_10h-family_15h/Kconfig
+++ b/src/cpu/amd/family_10h-family_15h/Kconfig
@@ -11,6 +11,7 @@ config CPU_AMD_MODEL_10XXX
 	select HAVE_MONOTONIC_TIMER
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select CPU_MICROCODE_MULTIPLE_FILES if !CPU_MICROCODE_CBFS_NONE
+	select ACPI_HUGE_LOWMEM_BACKUP
 
 if CPU_AMD_MODEL_10XXX
 
diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig
index c8bae33..804e698 100644
--- a/src/cpu/amd/model_fxx/Kconfig
+++ b/src/cpu/amd/model_fxx/Kconfig
@@ -10,6 +10,7 @@ config CPU_AMD_MODEL_FXX
 	select TSC_SYNC_LFENCE
 	select UDELAY_LAPIC
 	select SUPPORT_CPU_UCODE_IN_CBFS
+	select ACPI_HUGE_LOWMEM_BACKUP
 
 if CPU_AMD_MODEL_FXX
 config CPU_ADDR_BITS
diff --git a/src/cpu/amd/pi/Kconfig b/src/cpu/amd/pi/Kconfig
index 203fa03..ed379ea 100644
--- a/src/cpu/amd/pi/Kconfig
+++ b/src/cpu/amd/pi/Kconfig
@@ -28,7 +28,6 @@ config CPU_AMD_PI
 	select UDELAY_LAPIC
 	select LAPIC_MONOTONIC_TIMER
 	select SPI_FLASH if HAVE_ACPI_RESUME
-	select ACPI_TINY_LOWMEM_BACKUP
 
 if CPU_AMD_PI
 
diff --git a/src/northbridge/intel/nehalem/Kconfig b/src/northbridge/intel/nehalem/Kconfig
index 884660a..281f727 100644
--- a/src/northbridge/intel/nehalem/Kconfig
+++ b/src/northbridge/intel/nehalem/Kconfig
@@ -21,6 +21,7 @@ config NORTHBRIDGE_INTEL_NEHALEM
 	select TSC_MONOTONIC_TIMER
 	select INTEL_GMA_ACPI
 	select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE
+	select ACPI_HUGE_LOWMEM_BACKUP
 
 if NORTHBRIDGE_INTEL_NEHALEM