diff options
| author | Martin Roth <martinroth@google.com> | 2018-05-06 18:13:19 -0500 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2018-06-03 14:19:58 +0000 |
| commit | a50b1f9dd0e6caa3f33ddac4e54c44f881876ede (patch) | |
| tree | 1a7ba52f879da012b3d631faea799bc74aca55ac /src/southbridge | |
| parent | e36a00af719347f1f26d37d4b13fe2d416cdfef1 (diff) | |
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/southbridge')
| -rw-r--r-- | src/southbridge/intel/bd82x6x/acpi/globalnvs.asl | 3 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/acpi/globalnvs.asl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl index 2a3227d3da..f7652ee5a5 100644 --- a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl +++ b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl @@ -233,15 +233,16 @@ Method (XHCD) { Store (Zero, \XHCI) } -External (\_TZ.THRM) External (\_TZ.SKIN) Method (TZUP) { +#ifdef HAVE_THERMALZONE /* Update Primary Thermal Zone */ If (CondRefOf (\_TZ.THRM)) { Notify (\_TZ.THRM, 0x81) } +#endif /* Update Secondary Thermal Zone */ If (CondRefOf (\_TZ.SKIN)) { diff --git a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl index 468c755b16..ba9f850208 100644 --- a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl +++ b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl @@ -216,15 +216,16 @@ Method (S3GD) Store (Zero, \S33G) } -External (\_TZ.THRM) External (\_TZ.SKIN) Method (TZUP) { +#ifdef HAVE_THERMALZONE /* Update Primary Thermal Zone */ If (CondRefOf (\_TZ.THRM)) { Notify (\_TZ.THRM, 0x81) } +#endif /* Update Secondary Thermal Zone */ If (CondRefOf (\_TZ.SKIN)) { |