[coreboot-gerrit] Change in coreboot[master]: soc/amd/stoneyridge/acpi/sb_pci0_fch.asl: Fix instability

[Richard Spiegel (Code Review)]

Richard Spiegel has uploaded this change for review. ( https://review.coreboot.org/23573


Change subject: soc/amd/stoneyridge/acpi/sb_pci0_fch.asl: Fix instability
......................................................................

soc/amd/stoneyridge/acpi/sb_pci0_fch.asl: Fix instability

A file that has several methods cannot be included inside a method. It has
to be included inside a scope, but not inside a method or it'll cause
problems (instability).

BUG=b:62200858
TEST=Build kahlee.

Change-Id: If6c877df5a87df1b348de92868b91eed4a76de55
Signed-off-by: Richard Spiegel <richard.spiegel at silverbackltd.com>
---
M src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
1 file changed, 10 insertions(+), 2 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/23573/1

diff --git a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
index 216b57c..ad7326c 100644
--- a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
+++ b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
@@ -130,6 +130,10 @@
 	Return(CRES) /* note to change the Name buffer */
 } /* end of Method(_SB.PCI0._CRS) */
 
+#if IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)
+	#include "acpi/AmdImc.asl"
+#endif
+
 /*
  *
  *               FIRST METHOD CALLED UPON BOOT
@@ -155,9 +159,13 @@
 	/* Determine the OS we're running on */
 	OSFL()
 
+/*
+ * This is an ugly temporary construction part of a group of commits that
+ * will remove all #if from ASL files. This message plus this temporary
+ * construction will be removed in next commit from the series, its sole
+ * purpose to facilitate next commit.
+ */
 #if IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)
-	/* TODO: It is unstable. */
-	#include "acpi/AmdImc.asl"
 #if IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE)
 	ITZE() /* enable IMC Fan Control*/
 #endif

-- 
To view, visit https://review.coreboot.org/23573
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: If6c877df5a87df1b348de92868b91eed4a76de55
Gerrit-Change-Number: 23573
Gerrit-PatchSet: 1
Gerrit-Owner: Richard Spiegel <richard.spiegel at silverbackltd.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180202/3fb58438/attachment.html>