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/mainboard/google/butterfly | |
| 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/mainboard/google/butterfly')
| -rw-r--r-- | src/mainboard/google/butterfly/acpi/thermal.asl | 1 | ||||
| -rw-r--r-- | src/mainboard/google/butterfly/dsdt.asl | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mainboard/google/butterfly/acpi/thermal.asl b/src/mainboard/google/butterfly/acpi/thermal.asl index f6158bac0f..2faa7de636 100644 --- a/src/mainboard/google/butterfly/acpi/thermal.asl +++ b/src/mainboard/google/butterfly/acpi/thermal.asl @@ -15,6 +15,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/google/butterfly/dsdt.asl b/src/mainboard/google/butterfly/dsdt.asl index c1ea0e6717..b4fd6cff2d 100644 --- a/src/mainboard/google/butterfly/dsdt.asl +++ b/src/mainboard/google/butterfly/dsdt.asl @@ -29,14 +29,15 @@ DefinitionBlock( #include "acpi/platform.asl" #include "acpi/mainboard.asl" + // Thermal handler + #include "acpi/thermal.asl" + // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> // General Purpose Events //#include "acpi/gpe.asl" - #include "acpi/thermal.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> Scope (\_SB) { |