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@gmail.com> Reviewed-on: http://review.coreboot.org/10268 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
parent
b890a1228d
commit
11b01a9574
|
@ -220,28 +220,4 @@ Device (LPCB)
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "acpi/superio.asl"
|
#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
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -220,28 +220,4 @@ Device (LPCB)
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "acpi/superio.asl"
|
#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
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -227,28 +227,4 @@ Device (LPCB)
|
||||||
|
|
||||||
// Include mainboard's superio.asl file.
|
// Include mainboard's superio.asl file.
|
||||||
#include "acpi/superio.asl"
|
#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
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -203,30 +203,6 @@ Device (LPCB)
|
||||||
|
|
||||||
#include "acpi/superio.asl"
|
#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
|
Device (PS2K) // Keyboard
|
||||||
{
|
{
|
||||||
Name(_HID, EISAID("PNP0303"))
|
Name(_HID, EISAID("PNP0303"))
|
||||||
|
|
Loading…
Reference in New Issue