[coreboot-gerrit] New patch to review for coreboot: AGESA binaryPI: Remove ACPI for IMC we don't run

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Thu Mar 2 08:51:31 CET 2017


Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18536

-gerrit

commit c8ace0067d062ab56c70fdff5974f7fe1cc9f238
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Sat Jan 28 09:48:29 2017 +0200

    AGESA binaryPI: Remove ACPI for IMC we don't run
    
    IMC is used on some of the AMD reference designs, so do not
    touch them yet.
    
    Change-Id: Iae21e0294f0155f07fb4f4348ebc5b3120d50fd1
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/mainboard/asrock/imb-a180/acpi/AmdImc.asl      | 110 ---------------------
 src/mainboard/asus/f2a85-m/acpi/AmdImc.asl         |  97 ------------------
 src/mainboard/asus/f2a85-m_le/acpi/AmdImc.asl      |   1 -
 src/mainboard/bap/ode_e20XX/acpi/AmdImc.asl        | 110 ---------------------
 src/mainboard/bap/ode_e21XX/acpi/AmdImc.asl        | 109 --------------------
 src/mainboard/biostar/am1ml/acpi/AmdImc.asl        | 110 ---------------------
 src/mainboard/gizmosphere/gizmo2/acpi/AmdImc.asl   | 110 ---------------------
 src/mainboard/hp/abm/acpi/AmdImc.asl               | 110 ---------------------
 .../hp/pavilion_m6_1035dx/acpi/AmdImc.asl          |  97 ------------------
 src/mainboard/lenovo/g505s/acpi/AmdImc.asl         |  97 ------------------
 src/mainboard/msi/ms7721/acpi/AmdImc.asl           |  97 ------------------
 src/mainboard/pcengines/apu2/acpi/AmdImc.asl       | 109 --------------------
 src/southbridge/amd/agesa/hudson/acpi/fch.asl      |   2 +-
 src/southbridge/amd/pi/hudson/acpi/fch.asl         |   2 +
 14 files changed, 3 insertions(+), 1158 deletions(-)

diff --git a/src/mainboard/asrock/imb-a180/acpi/AmdImc.asl b/src/mainboard/asrock/imb-a180/acpi/AmdImc.asl
deleted file mode 100644
index aa941ba..0000000
--- a/src/mainboard/asrock/imb-a180/acpi/AmdImc.asl
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-//BTDC Due to IMC Fan, ACPI control codes
-OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
-Field(IMIO , ByteAcc, NoLock, Preserve) {
-	IMCX,8,
-	IMCA,8
-}
-
-IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
-	Offset(0x80),
-	MSTI, 8,
-	MITS, 8,
-	MRG0, 8,
-	MRG1, 8,
-	MRG2, 8,
-	MRG3, 8,
-}
-
-Method(WACK, 0)
-{
-	Store(0, Local0)
-	While (LNotEqual(Local0, 0xFA)) {
-		Store(MRG0, Local0)
-		Sleep(10)
-	}
-}
-
-//Init
-Method (ITZE, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
-
-//Sleep
-Method (IMSP, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(1, MRG1)
-	Store(0, MRG2)
-	Store(0x98, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0xB4, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-}
-
-//Wake
-Method (IMWK, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
diff --git a/src/mainboard/asus/f2a85-m/acpi/AmdImc.asl b/src/mainboard/asus/f2a85-m/acpi/AmdImc.asl
deleted file mode 100644
index f55a12ad..0000000
--- a/src/mainboard/asus/f2a85-m/acpi/AmdImc.asl
+++ /dev/null
@@ -1,97 +0,0 @@
-//BTDC Due to IMC Fan, ACPI control codes
-OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
-Field(IMIO , ByteAcc, NoLock, Preserve) {
-	IMCX,8,
-	IMCA,8
-}
-
-IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
-	Offset(0x80),
-	MSTI, 8,
-	MITS, 8,
-	MRG0, 8,
-	MRG1, 8,
-	MRG2, 8,
-	MRG3, 8,
-}
-
-Method(WACK, 0)
-{
-	Store(0, Local0)
-	Store(50, Local1)
-	While (LAnd (LNotEqual(Local0, 0xFA), LGreater(Local1,0))) {
-		Store(MRG0, Local0)
-		Sleep(10)
-		Decrement(Local1)
-	}
-}
-
-//Init
-Method (ITZE, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
-
-//Sleep
-Method (IMSP, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(1, MRG1)
-	Store(0, MRG2)
-	Store(0x98, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0xB4, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-}
-
-//Wake
-Method (IMWK, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
diff --git a/src/mainboard/asus/f2a85-m_le/acpi/AmdImc.asl b/src/mainboard/asus/f2a85-m_le/acpi/AmdImc.asl
deleted file mode 100644
index 43c2428..0000000
--- a/src/mainboard/asus/f2a85-m_le/acpi/AmdImc.asl
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../f2a85-m/acpi/AmdImc.asl"
diff --git a/src/mainboard/bap/ode_e20XX/acpi/AmdImc.asl b/src/mainboard/bap/ode_e20XX/acpi/AmdImc.asl
deleted file mode 100644
index aa941ba..0000000
--- a/src/mainboard/bap/ode_e20XX/acpi/AmdImc.asl
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-//BTDC Due to IMC Fan, ACPI control codes
-OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
-Field(IMIO , ByteAcc, NoLock, Preserve) {
-	IMCX,8,
-	IMCA,8
-}
-
-IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
-	Offset(0x80),
-	MSTI, 8,
-	MITS, 8,
-	MRG0, 8,
-	MRG1, 8,
-	MRG2, 8,
-	MRG3, 8,
-}
-
-Method(WACK, 0)
-{
-	Store(0, Local0)
-	While (LNotEqual(Local0, 0xFA)) {
-		Store(MRG0, Local0)
-		Sleep(10)
-	}
-}
-
-//Init
-Method (ITZE, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
-
-//Sleep
-Method (IMSP, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(1, MRG1)
-	Store(0, MRG2)
-	Store(0x98, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0xB4, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-}
-
-//Wake
-Method (IMWK, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
diff --git a/src/mainboard/bap/ode_e21XX/acpi/AmdImc.asl b/src/mainboard/bap/ode_e21XX/acpi/AmdImc.asl
deleted file mode 100644
index d3bb74e..0000000
--- a/src/mainboard/bap/ode_e21XX/acpi/AmdImc.asl
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
-Field(IMIO , ByteAcc, NoLock, Preserve) {
-	IMCX,8,
-	IMCA,8
-}
-
-IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
-	Offset(0x80),
-	MSTI, 8,
-	MITS, 8,
-	MRG0, 8,
-	MRG1, 8,
-	MRG2, 8,
-	MRG3, 8,
-}
-
-Method(WACK, 0)
-{
-	Store(0, Local0)
-	While (LNotEqual(Local0, 0xFA)) {
-		Store(MRG0, Local0)
-		Sleep(10)
-	}
-}
-
-//Init
-Method (ITZE, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
-
-//Sleep
-Method (IMSP, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(1, MRG1)
-	Store(0, MRG2)
-	Store(0x98, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0xB4, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-}
-
-//Wake
-Method (IMWK, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
diff --git a/src/mainboard/biostar/am1ml/acpi/AmdImc.asl b/src/mainboard/biostar/am1ml/acpi/AmdImc.asl
deleted file mode 100644
index aa941ba..0000000
--- a/src/mainboard/biostar/am1ml/acpi/AmdImc.asl
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-//BTDC Due to IMC Fan, ACPI control codes
-OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
-Field(IMIO , ByteAcc, NoLock, Preserve) {
-	IMCX,8,
-	IMCA,8
-}
-
-IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
-	Offset(0x80),
-	MSTI, 8,
-	MITS, 8,
-	MRG0, 8,
-	MRG1, 8,
-	MRG2, 8,
-	MRG3, 8,
-}
-
-Method(WACK, 0)
-{
-	Store(0, Local0)
-	While (LNotEqual(Local0, 0xFA)) {
-		Store(MRG0, Local0)
-		Sleep(10)
-	}
-}
-
-//Init
-Method (ITZE, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
-
-//Sleep
-Method (IMSP, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(1, MRG1)
-	Store(0, MRG2)
-	Store(0x98, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0xB4, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-}
-
-//Wake
-Method (IMWK, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/AmdImc.asl b/src/mainboard/gizmosphere/gizmo2/acpi/AmdImc.asl
deleted file mode 100644
index aa941ba..0000000
--- a/src/mainboard/gizmosphere/gizmo2/acpi/AmdImc.asl
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-//BTDC Due to IMC Fan, ACPI control codes
-OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
-Field(IMIO , ByteAcc, NoLock, Preserve) {
-	IMCX,8,
-	IMCA,8
-}
-
-IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
-	Offset(0x80),
-	MSTI, 8,
-	MITS, 8,
-	MRG0, 8,
-	MRG1, 8,
-	MRG2, 8,
-	MRG3, 8,
-}
-
-Method(WACK, 0)
-{
-	Store(0, Local0)
-	While (LNotEqual(Local0, 0xFA)) {
-		Store(MRG0, Local0)
-		Sleep(10)
-	}
-}
-
-//Init
-Method (ITZE, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
-
-//Sleep
-Method (IMSP, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(1, MRG1)
-	Store(0, MRG2)
-	Store(0x98, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0xB4, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-}
-
-//Wake
-Method (IMWK, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
diff --git a/src/mainboard/hp/abm/acpi/AmdImc.asl b/src/mainboard/hp/abm/acpi/AmdImc.asl
deleted file mode 100644
index aa941ba..0000000
--- a/src/mainboard/hp/abm/acpi/AmdImc.asl
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-//BTDC Due to IMC Fan, ACPI control codes
-OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
-Field(IMIO , ByteAcc, NoLock, Preserve) {
-	IMCX,8,
-	IMCA,8
-}
-
-IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
-	Offset(0x80),
-	MSTI, 8,
-	MITS, 8,
-	MRG0, 8,
-	MRG1, 8,
-	MRG2, 8,
-	MRG3, 8,
-}
-
-Method(WACK, 0)
-{
-	Store(0, Local0)
-	While (LNotEqual(Local0, 0xFA)) {
-		Store(MRG0, Local0)
-		Sleep(10)
-	}
-}
-
-//Init
-Method (ITZE, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
-
-//Sleep
-Method (IMSP, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(1, MRG1)
-	Store(0, MRG2)
-	Store(0x98, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0xB4, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-}
-
-//Wake
-Method (IMWK, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/AmdImc.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/AmdImc.asl
deleted file mode 100644
index f55a12ad..0000000
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/AmdImc.asl
+++ /dev/null
@@ -1,97 +0,0 @@
-//BTDC Due to IMC Fan, ACPI control codes
-OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
-Field(IMIO , ByteAcc, NoLock, Preserve) {
-	IMCX,8,
-	IMCA,8
-}
-
-IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
-	Offset(0x80),
-	MSTI, 8,
-	MITS, 8,
-	MRG0, 8,
-	MRG1, 8,
-	MRG2, 8,
-	MRG3, 8,
-}
-
-Method(WACK, 0)
-{
-	Store(0, Local0)
-	Store(50, Local1)
-	While (LAnd (LNotEqual(Local0, 0xFA), LGreater(Local1,0))) {
-		Store(MRG0, Local0)
-		Sleep(10)
-		Decrement(Local1)
-	}
-}
-
-//Init
-Method (ITZE, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
-
-//Sleep
-Method (IMSP, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(1, MRG1)
-	Store(0, MRG2)
-	Store(0x98, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0xB4, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-}
-
-//Wake
-Method (IMWK, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
diff --git a/src/mainboard/lenovo/g505s/acpi/AmdImc.asl b/src/mainboard/lenovo/g505s/acpi/AmdImc.asl
deleted file mode 100644
index f55a12ad..0000000
--- a/src/mainboard/lenovo/g505s/acpi/AmdImc.asl
+++ /dev/null
@@ -1,97 +0,0 @@
-//BTDC Due to IMC Fan, ACPI control codes
-OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
-Field(IMIO , ByteAcc, NoLock, Preserve) {
-	IMCX,8,
-	IMCA,8
-}
-
-IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
-	Offset(0x80),
-	MSTI, 8,
-	MITS, 8,
-	MRG0, 8,
-	MRG1, 8,
-	MRG2, 8,
-	MRG3, 8,
-}
-
-Method(WACK, 0)
-{
-	Store(0, Local0)
-	Store(50, Local1)
-	While (LAnd (LNotEqual(Local0, 0xFA), LGreater(Local1,0))) {
-		Store(MRG0, Local0)
-		Sleep(10)
-		Decrement(Local1)
-	}
-}
-
-//Init
-Method (ITZE, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
-
-//Sleep
-Method (IMSP, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(1, MRG1)
-	Store(0, MRG2)
-	Store(0x98, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0xB4, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-}
-
-//Wake
-Method (IMWK, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
diff --git a/src/mainboard/msi/ms7721/acpi/AmdImc.asl b/src/mainboard/msi/ms7721/acpi/AmdImc.asl
deleted file mode 100644
index f55a12ad..0000000
--- a/src/mainboard/msi/ms7721/acpi/AmdImc.asl
+++ /dev/null
@@ -1,97 +0,0 @@
-//BTDC Due to IMC Fan, ACPI control codes
-OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
-Field(IMIO , ByteAcc, NoLock, Preserve) {
-	IMCX,8,
-	IMCA,8
-}
-
-IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
-	Offset(0x80),
-	MSTI, 8,
-	MITS, 8,
-	MRG0, 8,
-	MRG1, 8,
-	MRG2, 8,
-	MRG3, 8,
-}
-
-Method(WACK, 0)
-{
-	Store(0, Local0)
-	Store(50, Local1)
-	While (LAnd (LNotEqual(Local0, 0xFA), LGreater(Local1,0))) {
-		Store(MRG0, Local0)
-		Sleep(10)
-		Decrement(Local1)
-	}
-}
-
-//Init
-Method (ITZE, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
-
-//Sleep
-Method (IMSP, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(1, MRG1)
-	Store(0, MRG2)
-	Store(0x98, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0xB4, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-}
-
-//Wake
-Method (IMWK, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
diff --git a/src/mainboard/pcengines/apu2/acpi/AmdImc.asl b/src/mainboard/pcengines/apu2/acpi/AmdImc.asl
deleted file mode 100644
index d3bb74e..0000000
--- a/src/mainboard/pcengines/apu2/acpi/AmdImc.asl
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
-Field(IMIO , ByteAcc, NoLock, Preserve) {
-	IMCX,8,
-	IMCA,8
-}
-
-IndexField(IMCX, IMCA, ByteAcc, NoLock, Preserve) {
-	Offset(0x80),
-	MSTI, 8,
-	MITS, 8,
-	MRG0, 8,
-	MRG1, 8,
-	MRG2, 8,
-	MRG3, 8,
-}
-
-Method(WACK, 0)
-{
-	Store(0, Local0)
-	While (LNotEqual(Local0, 0xFA)) {
-		Store(MRG0, Local0)
-		Sleep(10)
-	}
-}
-
-//Init
-Method (ITZE, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
-
-//Sleep
-Method (IMSP, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(1, MRG1)
-	Store(0, MRG2)
-	Store(0x98, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0xB4, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-}
-
-//Wake
-Method (IMWK, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
diff --git a/src/southbridge/amd/agesa/hudson/acpi/fch.asl b/src/southbridge/amd/agesa/hudson/acpi/fch.asl
index 7b0232a..2783f8c 100644
--- a/src/southbridge/amd/agesa/hudson/acpi/fch.asl
+++ b/src/southbridge/amd/agesa/hudson/acpi/fch.asl
@@ -175,7 +175,7 @@ Method(_INI, 0) {
 	/* Determine the OS we're running on */
 	OSFL()
 
-#if defined(CONFIG_HUDSON_IMC_FWM) && CONFIG_HUDSON_IMC_FWM
+#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
 	#include "acpi/AmdImc.asl" /* Hudson IMC function */
 	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 b8c0b35..e1e91f0 100644
--- a/src/southbridge/amd/pi/hudson/acpi/fch.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/fch.asl
@@ -158,11 +158,13 @@ Method(_INI, 0) {
 	/* Determine the OS we're running on */
 	OSFL()
 
+#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
 #if IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE)
 	/* TODO: It is unstable. */
 	#include "acpi/AmdImc.asl" /* Hudson IMC function */
 	ITZE() /* enable IMC Fan Control*/
 #endif
+#endif
 } /* End Method(_SB._INI) */
 
 Method(OSFL, 0){



More information about the coreboot-gerrit mailing list