[coreboot-gerrit] New patch to review for coreboot: mainboard/google/reef: correct EC ASL includes

[Aaron Durbin (adurbin@chromium.org)]

Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16413

-gerrit

commit 075d6447d524bdac9926b026e6d20fb495c83c73
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Thu Sep 1 18:05:27 2016 -0500

    mainboard/google/reef: correct EC ASL includes
    
    The superio.asl wasn't being included within the right scope.
    Fix that as well as clean up the per-mainboard header includes
    to be in one place.
    
    BUG=chrome-os-partner:56677
    
    Change-Id: I5e6a82f9f2e3c7455132263d19b32b2f06220376
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
 src/mainboard/google/reef/acpi/ec.asl        | 3 ---
 src/mainboard/google/reef/acpi/mainboard.asl | 3 ++-
 src/mainboard/google/reef/acpi/superio.asl   | 3 ---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/mainboard/google/reef/acpi/ec.asl b/src/mainboard/google/reef/acpi/ec.asl
index fe53cb5..b70c070 100644
--- a/src/mainboard/google/reef/acpi/ec.asl
+++ b/src/mainboard/google/reef/acpi/ec.asl
@@ -13,9 +13,6 @@
  * GNU General Public License for more details.
  */
 
-/* mainboard configuration */
-#include "../ec.h"
-
 /* Enable EC backed ALS device in ACPI */
 #define EC_ENABLE_ALS_DEVICE
 
diff --git a/src/mainboard/google/reef/acpi/mainboard.asl b/src/mainboard/google/reef/acpi/mainboard.asl
index 9665bb2..5bc82a1 100644
--- a/src/mainboard/google/reef/acpi/mainboard.asl
+++ b/src/mainboard/google/reef/acpi/mainboard.asl
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include "acpi/superio.asl"
+#include "../ec.h"
 #include "../gpio.h"
 
 Scope (\_SB)
@@ -37,5 +37,6 @@ Scope (\_SB)
 Scope (\_SB.PCI0.LPCB)
 {
 	/* Chrome OS Embedded Controller */
+	#include "superio.asl"
 	#include "ec.asl"
 }
diff --git a/src/mainboard/google/reef/acpi/superio.asl b/src/mainboard/google/reef/acpi/superio.asl
index d8ceddb..555e2a2 100644
--- a/src/mainboard/google/reef/acpi/superio.asl
+++ b/src/mainboard/google/reef/acpi/superio.asl
@@ -13,9 +13,6 @@
  * GNU General Public License for more details.
  */
 
-/* mainboard configuration */
-#include "../ec.h"
-
 #define SIO_EC_MEMMAP_ENABLE     // EC Memory Map Resources
 #define SIO_EC_HOST_ENABLE       // EC Host Interface Resources
 #define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard