diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2016-09-01 18:05:27 -0500 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-09-04 05:34:15 +0200 |
| commit | 5a87de86ae3119af13064b669465e51fffe676f4 (patch) | |
| tree | efd583cc71bac098989ce483f9360b38bb784feb /src/mainboard/google | |
| parent | 48b4cbdd94f1e126314eb055cd387011e7875845 (diff) | |
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@chromium.org>
Reviewed-on: https://review.coreboot.org/16413
Tested-by: build bot (Jenkins)
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Shaunak Saha <shaunak.saha@intel.com>
Diffstat (limited to 'src/mainboard/google')
| -rw-r--r-- | src/mainboard/google/reef/acpi/ec.asl | 3 | ||||
| -rw-r--r-- | src/mainboard/google/reef/acpi/mainboard.asl | 3 | ||||
| -rw-r--r-- | 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 fe53cb5559..b70c070ce2 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 9665bb291f..5bc82a13fe 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 d8ceddb4c8..555e2a24a6 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 |