[coreboot-gerrit] Change in ...coreboot[master]: ec/google/wilco: Guard DTPF with ifdef

[Duncan Laurie (Code Review)]

Duncan Laurie has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30036 )

Change subject: ec/google/wilco: Guard DTPF with ifdef
......................................................................

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 at google.com>
Reviewed-on: https://review.coreboot.org/c/30036
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
Reviewed-by: Furquan Shaikh <furquan at google.com>
---
M src/ec/google/wilco/acpi/dptf.asl
M src/ec/google/wilco/acpi/ec.asl
M src/ec/google/wilco/acpi/event.asl
3 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved



diff --git a/src/ec/google/wilco/acpi/dptf.asl b/src/ec/google/wilco/acpi/dptf.asl
index f5545d0..0f1663f 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 ff8fccc..f9b16b5 100644
--- a/src/ec/google/wilco/acpi/ec.asl
+++ b/src/ec/google/wilco/acpi/ec.asl
@@ -147,5 +147,7 @@
 	#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 21721f2..4a3394f 100644
--- a/src/ec/google/wilco/acpi/event.asl
+++ b/src/ec/google/wilco/acpi/event.asl
@@ -88,10 +88,12 @@
 {
 	Printf ("EVT3: %o", Arg0)
 
+#ifdef EC_ENABLE_DPTF
 	/* Theraml Events */
 	If (EBIT (E3TH, Arg0)) {
 		^PATX ()
 	}
+#endif
 }
 
 /* Handle events in PmEv4 */

-- 
To view, visit https://review.coreboot.org/c/coreboot/+/30036
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I612ad8f86d424060ca0303d267d7c2915c760173
Gerrit-Change-Number: 30036
Gerrit-PatchSet: 2
Gerrit-Owner: Duncan Laurie <dlaurie at chromium.org>
Gerrit-Reviewer: Duncan Laurie <dlaurie at chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan at google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181204/a55c1185/attachment.html>