[coreboot-gerrit] Change in coreboot[master]: mb/emulation/qemu-q35: Enable option for TPM

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/39836 )

Change subject: mb/emulation/qemu-q35: Enable option for TPM
......................................................................

mb/emulation/qemu-q35: Enable option for TPM

This enables the mainboard to use a TPM if it is selected in the
configuration.  By default this does nothing, but it allows the
TPM to be enabled and used with the CONFIG_USER_TPM2 Kconfig option.

Using a TPM with QEMU requires either a physical TPM backend or
the swtpm package with a socket:

-chardev socket,id=swtpm,path=/tmp/swtpm/socket
  -tpmdev emulator,id=tpm0,chardev=swtpm
  -device tpm-tis,tpmdev=tpm0

Change-Id: I0d79a5a0f590c57998ababb660b52d9e3ed2d484
Signed-off-by: Duncan Laurie 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39836
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
Reviewed-by: Paul Menzel 
---
M src/mainboard/emulation/qemu-q35/Kconfig
M src/mainboard/emulation/qemu-q35/devicetree.cb
2 files changed, 6 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Furquan Shaikh: Looks good to me, approved

diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index 71841fb..ee64060 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -12,6 +12,7 @@
    select BOARD_ROMSIZE_KB_16384 if VBOOT
    select MAINBOARD_HAS_NATIVE_VGA_INIT
    select MAINBOARD_FORCE_NATIVE_VGA_INIT
+	select MAINBOARD_HAS_LPC_TPM

config VBOOT
    select VBOOT_MUST_REQUEST_DISPLAY
diff --git a/src/mainboard/emulation/qemu-q35/devicetree.cb b/src/mainboard/emulation/qemu-q35/devicetree.cb
index c032606..ff0589f 100644
--- a/src/mainboard/emulation/qemu-q35/devicetree.cb
+++ b/src/mainboard/emulation/qemu-q35/devicetree.cb
@@ -8,7 +8,11 @@
    	device pci 0.0 mandatory end		# northbridge (q35)
    	chip southbridge/intel/i82801ix
    		# present unconditionally
-			device pci 1f.0 mandatory end	# LPC
+			device pci 1f.0 mandatory
+				chip drivers/pc80/tpm
+					device pnp 0c31.0 on end
+				end
+			end	# LPC
    		device pci 1f.2 on end	# SATA
    		device pci 1f.3 on end	# SMBus