[coreboot-gerrit] Patch set updated for coreboot: intel/fsp_rangeley: change non-existent config options to #defines

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12552

-gerrit

commit 7db211ce41c7ed114b9e3496c59f7378ac77bd29
Author: Martin Roth <martinroth at google.com>
Date:   Thu Nov 26 15:58:12 2015 -0700

    intel/fsp_rangeley: change non-existent config options to #defines
    
    The Kconfig symbols ONFIG_ACPI_INCLUDE_PMIO and CONFIG_ACPI_INCLUDE_GPIO
    were never added to the coreboot codebase when the Rangeley code was
    brought in from Sage.  These symbols disabled ACPI code that was unused
    because it caused dmesg warnings due to conflicts with drivers trying to
    claim the same addresses as the ACPI code.  Because it could be used on
    some other platforms, it was left in instead of being completely
    removed.
    
    - Change the Kconfig symbol names to simple #defines in the mainboard
    code.
    - Add the #defines along with comments to the reference platform.
    - Hook everything together in dsdt.asl
    - Update new mainboard littleplains the same way.
    
    Change-Id: I1f62157c6e447ea9b7207699572930e4711fc3e0
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 src/mainboard/intel/littleplains/acpi/mainboard.asl | 3 +++
 src/mainboard/intel/littleplains/dsdt.asl           | 3 +++
 src/mainboard/intel/mohonpeak/acpi/mainboard.asl    | 3 +++
 src/mainboard/intel/mohonpeak/dsdt.asl              | 3 +++
 src/southbridge/intel/fsp_rangeley/acpi/soc.asl     | 4 ++--
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/mainboard/intel/littleplains/acpi/mainboard.asl b/src/mainboard/intel/littleplains/acpi/mainboard.asl
index c43d2db..aecc2b6 100644
--- a/src/mainboard/intel/littleplains/acpi/mainboard.asl
+++ b/src/mainboard/intel/littleplains/acpi/mainboard.asl
@@ -14,6 +14,9 @@
  * GNU General Public License for more details.
  */
 
+// #define ACPI_INCLUDE_PMIO 1 /* uncomment to enable PMIO block in soc.asl */
+// #define ACPI_INCLUDE_GPIO 1 /* uncomment to enable GPIO block in soc.asl */
+
 Device (PWRB)
 {
 	Name(_HID, EisaId("PNP0C0C"))
diff --git a/src/mainboard/intel/littleplains/dsdt.asl b/src/mainboard/intel/littleplains/dsdt.asl
index dbb8b15..ec56e26 100644
--- a/src/mainboard/intel/littleplains/dsdt.asl
+++ b/src/mainboard/intel/littleplains/dsdt.asl
@@ -23,6 +23,9 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
+	// Include mainboard configuration
+	#include <acpi/mainboard.asl>
+
 	// Include debug methods
 	#include <arch/x86/acpi/debug.asl>
 
diff --git a/src/mainboard/intel/mohonpeak/acpi/mainboard.asl b/src/mainboard/intel/mohonpeak/acpi/mainboard.asl
index c43d2db..aecc2b6 100644
--- a/src/mainboard/intel/mohonpeak/acpi/mainboard.asl
+++ b/src/mainboard/intel/mohonpeak/acpi/mainboard.asl
@@ -14,6 +14,9 @@
  * GNU General Public License for more details.
  */
 
+// #define ACPI_INCLUDE_PMIO 1 /* uncomment to enable PMIO block in soc.asl */
+// #define ACPI_INCLUDE_GPIO 1 /* uncomment to enable GPIO block in soc.asl */
+
 Device (PWRB)
 {
 	Name(_HID, EisaId("PNP0C0C"))
diff --git a/src/mainboard/intel/mohonpeak/dsdt.asl b/src/mainboard/intel/mohonpeak/dsdt.asl
index dbb8b15..ec56e26 100644
--- a/src/mainboard/intel/mohonpeak/dsdt.asl
+++ b/src/mainboard/intel/mohonpeak/dsdt.asl
@@ -23,6 +23,9 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
+	// Include mainboard configuration
+	#include <acpi/mainboard.asl>
+
 	// Include debug methods
 	#include <arch/x86/acpi/debug.asl>
 
diff --git a/src/southbridge/intel/fsp_rangeley/acpi/soc.asl b/src/southbridge/intel/fsp_rangeley/acpi/soc.asl
index 22edf50..696a81a 100644
--- a/src/southbridge/intel/fsp_rangeley/acpi/soc.asl
+++ b/src/southbridge/intel/fsp_rangeley/acpi/soc.asl
@@ -30,7 +30,7 @@ Scope(\)
 		TRP0, 8		// IO-Trap at 0x808
 	}
 
-#if IS_ENABLED(CONFIG_ACPI_INCLUDE_PMIO)
+#ifdef ACPI_INCLUDE_PMIO
 	// PCH Power Management Registers, located at PMBASE (0x1f.0 0x40.l)
 	OperationRegion(PMIO, SystemIO, DEFAULT_ABASE, 0x80)
 	Field(PMIO, ByteAcc, NoLock, Preserve)
@@ -77,7 +77,7 @@ Scope(\)
 	}
 #endif
 
-#if IS_ENABLED(CONFIG_ACPI_INCLUDE_GPIO)
+#ifdef ACPI_INCLUDE_GPIO
 	// GPIO IO mapped registers (0x1f.0 reg 0x48.l)
 	OperationRegion(GPIO, SystemIO, DEFAULT_GPIOBASE, 0x6c)
 	Field(GPIO, ByteAcc, NoLock, Preserve)