summaryrefslogtreecommitdiff
path: root/src/mainboard/google/beltino
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2018-05-06 18:13:19 -0500
committerMartin Roth <martinroth@google.com>2018-06-03 14:19:58 +0000
commita50b1f9dd0e6caa3f33ddac4e54c44f881876ede (patch)
tree1a7ba52f879da012b3d631faea799bc74aca55ac /src/mainboard/google/beltino
parente36a00af719347f1f26d37d4b13fe2d416cdfef1 (diff)
downloadcoreboot-a50b1f9dd0e6caa3f33ddac4e54c44f881876ede.tar.xz
intel bd82x6x/lynxpoint systems: Update ACPI thermal zone handler
Currently the throttle event handler method THRM is defined as an extern on the intel bd82x6x and lynxpoint chipsets, then defined again in the platform with thermal event handling. In newer versions of IASL, this generates an error, as the method is defined in two places. Simply removing the extern causes the call to it to fail on platforms where it isn't actually defined, so add a preprocessor define where it's implemented, and only call the method on those platforms. This also requires moving the thermal handler, which now includes the define to before the gnvs asl file. TEST=Build before and after, make sure correct code is included. Change-Id: I7af4a346496c1352ec20bda8acb338b5d277d99b Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/26123 Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/beltino')
-rw-r--r--src/mainboard/google/beltino/acpi/thermal.asl1
-rw-r--r--src/mainboard/google/beltino/dsdt.asl6
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mainboard/google/beltino/acpi/thermal.asl b/src/mainboard/google/beltino/acpi/thermal.asl
index af36a5c985..1d4eca3a09 100644
--- a/src/mainboard/google/beltino/acpi/thermal.asl
+++ b/src/mainboard/google/beltino/acpi/thermal.asl
@@ -17,6 +17,7 @@
// Thermal Zone
+#define HAVE_THERMALZONE
Scope (\_TZ)
{
ThermalZone (THRM)
diff --git a/src/mainboard/google/beltino/dsdt.asl b/src/mainboard/google/beltino/dsdt.asl
index 6393d688fb..268cd9dc9e 100644
--- a/src/mainboard/google/beltino/dsdt.asl
+++ b/src/mainboard/google/beltino/dsdt.asl
@@ -26,6 +26,9 @@ DefinitionBlock(
// Some generic macros
#include "acpi/platform.asl"
+ // Thermal handler
+ #include "acpi/thermal.asl"
+
// global NVS and variables
#include <southbridge/intel/lynxpoint/acpi/globalnvs.asl>
@@ -45,9 +48,6 @@ DefinitionBlock(
// Mainboard devices
#include "acpi/mainboard.asl"
- // Thermal handler
- #include "acpi/thermal.asl"
-
// Chrome OS specific
#include <vendorcode/google/chromeos/acpi/chromeos.asl>