diff options
| author | Duncan Laurie <dlaurie@google.com> | 2018-12-04 10:13:25 -0800 |
|---|---|---|
| committer | Duncan Laurie <dlaurie@chromium.org> | 2018-12-04 22:49:13 +0000 |
| commit | bfb001d1a0b953fd832fce6bb13c02657ab1139f (patch) | |
| tree | c86e6c2d274791d16d59f10a8177ea53f406f147 | |
| parent | 98d7de7ea93379957fc3f48bef6912e9947e1099 (diff) | |
| download | coreboot-bfb001d1a0b953fd832fce6bb13c02657ab1139f.tar.xz | |
ec/google/wilco: Guard DTPF with ifdef
There is a dependency issue with the EC DPTF code accessing
methods that are external, but once the mainboard includes the
relevant code they become internal and the current version of
IASL used by jenkins will fail to compile it.
Until the new IASL is deployed everywhere wrap the EC DPTF code
and expect that the mainboard will explicitly enable it.
Change-Id: I612ad8f86d424060ca0303d267d7c2915c760173
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Reviewed-on: https://review.coreboot.org/c/30036
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
| -rw-r--r-- | src/ec/google/wilco/acpi/dptf.asl | 4 | ||||
| -rw-r--r-- | src/ec/google/wilco/acpi/ec.asl | 2 | ||||
| -rw-r--r-- | src/ec/google/wilco/acpi/event.asl | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/ec/google/wilco/acpi/dptf.asl b/src/ec/google/wilco/acpi/dptf.asl index f5545d0c79..0f1663f714 100644 --- a/src/ec/google/wilco/acpi/dptf.asl +++ b/src/ec/google/wilco/acpi/dptf.asl @@ -18,10 +18,6 @@ * Dynamic Platform Thermal Framework support */ -External (\_SB.DPTF.CTOK, MethodObj) -External (\_SB.DPTF.KTOC, MethodObj) -External (\_SB.DPTF.TEVT, MethodObj) - /* Mutex for EC PAT interface */ Mutex (PATM, 1) diff --git a/src/ec/google/wilco/acpi/ec.asl b/src/ec/google/wilco/acpi/ec.asl index ff8fccc596..f9b16b5bb1 100644 --- a/src/ec/google/wilco/acpi/ec.asl +++ b/src/ec/google/wilco/acpi/ec.asl @@ -147,5 +147,7 @@ Device (EC0) #include "event.asl" #include "lid.asl" #include "platform.asl" +#ifdef EC_ENABLE_DPTF #include "dptf.asl" +#endif } diff --git a/src/ec/google/wilco/acpi/event.asl b/src/ec/google/wilco/acpi/event.asl index 21721f2750..4a3394feec 100644 --- a/src/ec/google/wilco/acpi/event.asl +++ b/src/ec/google/wilco/acpi/event.asl @@ -88,10 +88,12 @@ Method (ECQ3, 1, Serialized) { Printf ("EVT3: %o", Arg0) +#ifdef EC_ENABLE_DPTF /* Theraml Events */ If (EBIT (E3TH, Arg0)) { ^PATX () } +#endif } /* Handle events in PmEv4 */ |