Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/18523 )
Change subject: mainboard/pcengines/apu2: Add LPC TPM support ......................................................................
mainboard/pcengines/apu2: Add LPC TPM support
APU2 exposes a LPC header which can be used in conjunction with a LPC TPM module.
Change-Id: If9312370a5071ffbeb6d83888c75fa69a0c27819 Signed-off-by: Philipp Deppenwiese zaolin@das-labor.org Reviewed-on: https://review.coreboot.org/18523 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Martin Roth martinroth@google.com --- M src/mainboard/pcengines/apu2/Kconfig M src/mainboard/pcengines/apu2/devicetree.cb M src/mainboard/pcengines/apu2/romstage.c 3 files changed, 10 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved
diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig index 4303b84..013df79 100644 --- a/src/mainboard/pcengines/apu2/Kconfig +++ b/src/mainboard/pcengines/apu2/Kconfig @@ -28,6 +28,8 @@ select BOARD_ROMSIZE_KB_8192 select HUDSON_DISABLE_IMC select USE_BLOBS + select TPM + select MAINBOARD_HAS_LPC_TPM
config MAINBOARD_DIR string diff --git a/src/mainboard/pcengines/apu2/devicetree.cb b/src/mainboard/pcengines/apu2/devicetree.cb index 3c5ec81..4f32064 100644 --- a/src/mainboard/pcengines/apu2/devicetree.cb +++ b/src/mainboard/pcengines/apu2/devicetree.cb @@ -73,7 +73,10 @@ device pnp 2e.607 off end device pnp 2e.e off end end # SIO NCT5104D - end # LPC 0x439d + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end # LPC TPM + end # LPC 0x439d
device pci 14.7 on end # SD device pci 16.0 on end # USB EHCI2 usb[8:7] - muxed with XHCI diff --git a/src/mainboard/pcengines/apu2/romstage.c b/src/mainboard/pcengines/apu2/romstage.c index a0d925f..c95adb6 100644 --- a/src/mainboard/pcengines/apu2/romstage.c +++ b/src/mainboard/pcengines/apu2/romstage.c @@ -31,6 +31,8 @@ #include <cpu/x86/lapic.h> #include <southbridge/amd/pi/hudson/hudson.h> #include <Fch/Fch.h> +#include <tpm.h> + #include "gpio_ftns.h"
static void early_lpc_init(void); @@ -92,6 +94,8 @@ */ disable_cache_as_ram();
+ init_tpm(false); + outb(0xEA, 0xCD6); outb(0x1, 0xcd7);