summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2019-02-21 16:38:43 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-02-25 11:17:54 +0000
commit99850600d06f837759d2404f03dc908969ed42c3 (patch)
tree53dce107caa029bedabc554476154d644fe2fabe
parenta213ed659a5a535875166a8a1d1f631dd6c606f7 (diff)
downloadcoreboot-99850600d06f837759d2404f03dc908969ed42c3.tar.xz
sb/amd/hudson/acpi: Fix illegal object references
Issue spotted using IASL 20190215 on mainboard GIZMOSPHERE_GIZMO2: "Object is created temporarily in another method and cannot be accessed" Change-Id: I1e4ca2c765083db3a27e415d3a69bef0912a606b Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/31554 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
-rw-r--r--src/southbridge/amd/agesa/hudson/acpi/fch.asl5
-rw-r--r--src/southbridge/amd/pi/hudson/acpi/fch.asl9
2 files changed, 11 insertions, 3 deletions
diff --git a/src/southbridge/amd/agesa/hudson/acpi/fch.asl b/src/southbridge/amd/agesa/hudson/acpi/fch.asl
index 4d53051ad2..83e3410ccb 100644
--- a/src/southbridge/amd/agesa/hudson/acpi/fch.asl
+++ b/src/southbridge/amd/agesa/hudson/acpi/fch.asl
@@ -146,6 +146,10 @@ Method(_CRS, 0) {
Return(CRES) /* note to change the Name buffer */
} /* end of Method(_SB.PCI0._CRS) */
+#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
+ #include "acpi/AmdImc.asl" /* Hudson IMC function */
+#endif
+
/*
*
* FIRST METHOD CALLED UPON BOOT
@@ -172,7 +176,6 @@ Method(_INI, 0) {
OSFL()
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
- #include "acpi/AmdImc.asl" /* Hudson IMC function */
#if IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE)
ITZE() /* enable IMC Fan Control*/
#endif
diff --git a/src/southbridge/amd/pi/hudson/acpi/fch.asl b/src/southbridge/amd/pi/hudson/acpi/fch.asl
index 0c6e76833e..17f5140a71 100644
--- a/src/southbridge/amd/pi/hudson/acpi/fch.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/fch.asl
@@ -129,6 +129,13 @@ Method(_CRS, 0) {
Return(CRES) /* note to change the Name buffer */
} /* end of Method(_SB.PCI0._CRS) */
+#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
+ /* TODO: It is unstable.
+ * might be fixed by restructuring
+ */
+ #include "acpi/AmdImc.asl" /* Hudson IMC function */
+#endif
+
/*
*
* FIRST METHOD CALLED UPON BOOT
@@ -155,8 +162,6 @@ Method(_INI, 0) {
OSFL()
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
- /* TODO: It is unstable. */
- #include "acpi/AmdImc.asl" /* Hudson IMC function */
#if IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE)
ITZE() /* enable IMC Fan Control*/
#endif