x201: Add TPM declaration.
This allows to deactivate TPM on X201. Change-Id: Ic085db6cc2c57668e7a4fdbc7440735c806cc256 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/10278 Tested-by: build bot (Jenkins) Reviewed-by: Philipp Deppenwiese <zaolin@das-labor.org>
This commit is contained in:
parent
61273d4619
commit
a93c0143ac
src/mainboard/lenovo/x201
|
@ -19,6 +19,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
||||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||||
select SUPERIO_NSC_PC87382
|
select SUPERIO_NSC_PC87382
|
||||||
select DRIVERS_LENOVO_WACOM
|
select DRIVERS_LENOVO_WACOM
|
||||||
|
select MAINBOARD_HAS_LPC_TPM
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
string
|
string
|
||||||
|
|
|
@ -153,6 +153,9 @@ chip northbridge/intel/nehalem
|
||||||
# DLPC, not connected
|
# DLPC, not connected
|
||||||
device pnp 164e.19 off end
|
device pnp 164e.19 off end
|
||||||
end
|
end
|
||||||
|
chip drivers/pc80/tpm
|
||||||
|
device pnp 0c31.0 on end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
device pci 1f.2 on # IDE/SATA
|
device pci 1f.2 on # IDE/SATA
|
||||||
subsystemid 0x17aa 0x2168
|
subsystemid 0x17aa 0x2168
|
||||||
|
|
|
@ -87,6 +87,14 @@ DefinitionBlock(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* LPC Trusted Platform Module
|
||||||
|
*/
|
||||||
|
Scope (\_SB.PCI0.LPCB)
|
||||||
|
{
|
||||||
|
#include <drivers/pc80/tpm/acpi/tpm.asl>
|
||||||
|
}
|
||||||
|
|
||||||
/* Chipset specific sleep states */
|
/* Chipset specific sleep states */
|
||||||
#include <southbridge/intel/i82801gx/acpi/sleepstates.asl>
|
#include <southbridge/intel/i82801gx/acpi/sleepstates.asl>
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
#include <timestamp.h>
|
#include <timestamp.h>
|
||||||
#include <arch/acpi.h>
|
#include <arch/acpi.h>
|
||||||
#include <cbmem.h>
|
#include <cbmem.h>
|
||||||
|
#include <tpm.h>
|
||||||
|
|
||||||
#include "gpio.h"
|
#include "gpio.h"
|
||||||
#include "dock.h"
|
#include "dock.h"
|
||||||
|
@ -306,5 +307,9 @@ void main(unsigned long bist)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if CONFIG_LPC_TPM
|
||||||
|
init_tpm(s3resume);
|
||||||
|
#endif
|
||||||
|
|
||||||
timestamp_add_now(TS_END_ROMSTAGE);
|
timestamp_add_now(TS_END_ROMSTAGE);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue