[coreboot-gerrit] New patch to review for coreboot: 4c48d91 Kill ENABLE_TPM.

[Vladimir Serbinenko (phcoder@gmail.com)]

Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10268

-gerrit

commit 4c48d91458966f84bdfab543ca7a0031d1e83c2b
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date:   Wed May 20 11:14:25 2015 +0200

    Kill ENABLE_TPM.
    
    It's used only in P470 and lynxpoint machines. Remove it from other
    southbridges. New machines should use src/drivers/pc80/tpm.
    
    Change-Id: I4741e76df4c6204d65562f016abac9ed60558432
    Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
---
 src/southbridge/intel/bd82x6x/acpi/lpc.asl      | 24 ------------------------
 src/southbridge/intel/fsp_bd82x6x/acpi/lpc.asl  | 24 ------------------------
 src/southbridge/intel/fsp_rangeley/acpi/lpc.asl | 24 ------------------------
 src/southbridge/intel/i82801ix/acpi/lpc.asl     | 24 ------------------------
 4 files changed, 96 deletions(-)

diff --git a/src/southbridge/intel/bd82x6x/acpi/lpc.asl b/src/southbridge/intel/bd82x6x/acpi/lpc.asl
index cc59850..6feb7f3 100644
--- a/src/southbridge/intel/bd82x6x/acpi/lpc.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/lpc.asl
@@ -221,28 +221,4 @@ Device (LPCB)
 	}
 
 	#include "acpi/superio.asl"
-
-#ifdef ENABLE_TPM
-	Device (TPM)		// Trusted Platform Module
-	{
-		Name(_HID, EISAID("IFX0102"))
-		Name(_CID, 0x310cd041)
-		Name(_UID, 1)
-
-		Method(_STA, 0)
-		{
-			If (TPMP) {
-				Return (0xf)
-			}
-			Return (0x0)
-		}
-
-		Name(_CRS, ResourceTemplate() {
-			IO (Decode16, 0x2e, 0x2e, 0x01, 0x02)
-			IO (Decode16, 0x6f0, 0x6f0, 0x01, 0x10)
-			Memory32Fixed (ReadWrite, 0xfed40000, 0x5000)
-			IRQ (Edge, Activehigh, Exclusive) { 6 }
-		})
-	}
-#endif
 }
diff --git a/src/southbridge/intel/fsp_bd82x6x/acpi/lpc.asl b/src/southbridge/intel/fsp_bd82x6x/acpi/lpc.asl
index cc59850..6feb7f3 100644
--- a/src/southbridge/intel/fsp_bd82x6x/acpi/lpc.asl
+++ b/src/southbridge/intel/fsp_bd82x6x/acpi/lpc.asl
@@ -221,28 +221,4 @@ Device (LPCB)
 	}
 
 	#include "acpi/superio.asl"
-
-#ifdef ENABLE_TPM
-	Device (TPM)		// Trusted Platform Module
-	{
-		Name(_HID, EISAID("IFX0102"))
-		Name(_CID, 0x310cd041)
-		Name(_UID, 1)
-
-		Method(_STA, 0)
-		{
-			If (TPMP) {
-				Return (0xf)
-			}
-			Return (0x0)
-		}
-
-		Name(_CRS, ResourceTemplate() {
-			IO (Decode16, 0x2e, 0x2e, 0x01, 0x02)
-			IO (Decode16, 0x6f0, 0x6f0, 0x01, 0x10)
-			Memory32Fixed (ReadWrite, 0xfed40000, 0x5000)
-			IRQ (Edge, Activehigh, Exclusive) { 6 }
-		})
-	}
-#endif
 }
diff --git a/src/southbridge/intel/fsp_rangeley/acpi/lpc.asl b/src/southbridge/intel/fsp_rangeley/acpi/lpc.asl
index 93c3bc1..437bc9f 100644
--- a/src/southbridge/intel/fsp_rangeley/acpi/lpc.asl
+++ b/src/southbridge/intel/fsp_rangeley/acpi/lpc.asl
@@ -228,28 +228,4 @@ Device (LPCB)
 
 	// Include mainboard's superio.asl file.
 	#include "acpi/superio.asl"
-
-#ifdef ENABLE_TPM
-	Device (TPM)		// Trusted Platform Module
-	{
-		Name(_HID, EISAID("IFX0102"))
-		Name(_CID, 0x310cd041)
-		Name(_UID, 1)
-
-		Method(_STA, 0)
-		{
-			If (TPMP) {
-				Return (0xf)
-			}
-			Return (0x0)
-		}
-
-		Name(_CRS, ResourceTemplate() {
-			IO (Decode16, 0x2e, 0x2e, 0x01, 0x02)
-			IO (Decode16, 0x6f0, 0x6f0, 0x01, 0x10)
-			Memory32Fixed (ReadWrite, 0xfed40000, 0x5000)
-			IRQ (Edge, Activehigh, Exclusive) { 6 }
-		})
-	}
-#endif
 }
diff --git a/src/southbridge/intel/i82801ix/acpi/lpc.asl b/src/southbridge/intel/i82801ix/acpi/lpc.asl
index 0d1e68a..adf7480 100644
--- a/src/southbridge/intel/i82801ix/acpi/lpc.asl
+++ b/src/southbridge/intel/i82801ix/acpi/lpc.asl
@@ -204,30 +204,6 @@ Device (LPCB)
 
 	#include "acpi/superio.asl"
 
-#ifdef ENABLE_TPM
-	Device (TPM)		// Trusted Platform Module
-	{
-		Name(_HID, EISAID("IFX0102"))
-		Name(_CID, 0x310cd041)
-		Name(_UID, 1)
-
-		Method(_STA, 0)
-		{
-			If (TPMP) {
-				Return (0xf)
-			}
-			Return (0x0)
-		}
-
-		Name(_CRS, ResourceTemplate() {
-			IO (Decode16, 0x2e, 0x2e, 0x01, 0x02)
-			IO (Decode16, 0x6f0, 0x6f0, 0x01, 0x10)
-			Memory32Fixed (ReadWrite, 0xfed40000, 0x5000)
-			IRQ (Edge, Activehigh, Exclusive) { 6 }
-		})
-	}
-#endif
-
 	Device (PS2K)		// Keyboard
 	{
 		Name(_HID, EISAID("PNP0303"))