From a50b1f9dd0e6caa3f33ddac4e54c44f881876ede Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sun, 6 May 2018 18:13:19 -0500 Subject: 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 Reviewed-on: https://review.coreboot.org/26123 Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- src/mainboard/google/jecht/dsdt.asl | 6 +++--- .../google/jecht/variants/guado/include/variant/acpi/thermal.asl | 1 + .../google/jecht/variants/jecht/include/variant/acpi/thermal.asl | 1 + .../google/jecht/variants/rikku/include/variant/acpi/thermal.asl | 1 + .../google/jecht/variants/tidus/include/variant/acpi/thermal.asl | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/mainboard/google/jecht') diff --git a/src/mainboard/google/jecht/dsdt.asl b/src/mainboard/google/jecht/dsdt.asl index 1ac32887d1..8157a84d36 100644 --- a/src/mainboard/google/jecht/dsdt.asl +++ b/src/mainboard/google/jecht/dsdt.asl @@ -26,6 +26,9 @@ DefinitionBlock( // Some generic macros #include "acpi/platform.asl" + // Thermal handler + #include + // global NVS and variables #include @@ -43,9 +46,6 @@ DefinitionBlock( } } - // Thermal handler - #include - // Chrome OS specific #include diff --git a/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl index 1cd1b9b713..d09b4915fb 100644 --- a/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl +++ b/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl @@ -17,6 +17,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl index 1cd1b9b713..d09b4915fb 100644 --- a/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl +++ b/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl @@ -17,6 +17,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl index 151ac51289..7bf7155dca 100644 --- a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl +++ b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl @@ -17,6 +17,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl index 78e7bf75c7..177d75e1c7 100644 --- a/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl +++ b/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl @@ -17,6 +17,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) -- cgit v1.2.3