9020 sff/mt: add tpm enable patch from mate kukri
Signed-off-by: Leah Rowe <leah@libreboot.org>9020tpm
parent
08859bb4a5
commit
2d7debd33c
|
@ -0,0 +1,49 @@
|
||||||
|
From cd3c553a313a26494e5dc31ff8323c3a919f190a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mate Kukri <kukri.mate@gmail.com>
|
||||||
|
Date: Wed, 10 Apr 2024 20:31:35 +0100
|
||||||
|
Subject: [PATCH 1/1] mb/dell/optiplex_9020: Add support for TPM1.2 device
|
||||||
|
|
||||||
|
These machines come with a TPM1.2 device by default. It is somewhat
|
||||||
|
obsolete these days, but there is no harm in enabling it.
|
||||||
|
|
||||||
|
Change-Id: Iec05321862aed58695c256b00494e5953219786d
|
||||||
|
Signed-off-by: Mate Kukri <kukri.mate@gmail.com>
|
||||||
|
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81827
|
||||||
|
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
|
||||||
|
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
|
||||||
|
---
|
||||||
|
src/mainboard/dell/optiplex_9020/Kconfig | 2 ++
|
||||||
|
src/mainboard/dell/optiplex_9020/devicetree.cb | 3 +++
|
||||||
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/mainboard/dell/optiplex_9020/Kconfig b/src/mainboard/dell/optiplex_9020/Kconfig
|
||||||
|
index 774a72f161..296938aa8d 100644
|
||||||
|
--- a/src/mainboard/dell/optiplex_9020/Kconfig
|
||||||
|
+++ b/src/mainboard/dell/optiplex_9020/Kconfig
|
||||||
|
@@ -12,7 +12,9 @@ config BOARD_SPECIFIC_OPTIONS
|
||||||
|
select INTEL_GMA_HAVE_VBT
|
||||||
|
select INTEL_INT15
|
||||||
|
select MAINBOARD_HAS_LIBGFXINIT
|
||||||
|
+ select MAINBOARD_HAS_TPM1
|
||||||
|
select MAINBOARD_USES_IFD_GBE_REGION
|
||||||
|
+ select MEMORY_MAPPED_TPM
|
||||||
|
select NORTHBRIDGE_INTEL_HASWELL
|
||||||
|
select SERIRQ_CONTINUOUS_MODE
|
||||||
|
select SOUTHBRIDGE_INTEL_LYNXPOINT
|
||||||
|
diff --git a/src/mainboard/dell/optiplex_9020/devicetree.cb b/src/mainboard/dell/optiplex_9020/devicetree.cb
|
||||||
|
index 7bfa6736a6..e5cbd64127 100644
|
||||||
|
--- a/src/mainboard/dell/optiplex_9020/devicetree.cb
|
||||||
|
+++ b/src/mainboard/dell/optiplex_9020/devicetree.cb
|
||||||
|
@@ -70,6 +70,9 @@ chip northbridge/intel/haswell
|
||||||
|
device pnp 2e.b off end # Floppy Controller
|
||||||
|
device pnp 2e.11 off end # Parallel Port
|
||||||
|
end
|
||||||
|
+ chip drivers/pc80/tpm
|
||||||
|
+ device pnp 0c31.0 on end
|
||||||
|
+ end
|
||||||
|
end
|
||||||
|
device pci 1f.2 on end # SATA controller 1
|
||||||
|
device pci 1f.3 on end # SMBus
|
||||||
|
--
|
||||||
|
2.39.2
|
||||||
|
|
|
@ -134,6 +134,7 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
|
||||||
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
||||||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||||
# CONFIG_CONSOLE_POST is not set
|
# CONFIG_CONSOLE_POST is not set
|
||||||
|
CONFIG_TPM_PIRQ=0x0
|
||||||
# CONFIG_BOARD_DELL_E6400 is not set
|
# CONFIG_BOARD_DELL_E6400 is not set
|
||||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||||
CONFIG_BOARD_DELL_OPTIPLEX_9020_MT=y
|
CONFIG_BOARD_DELL_OPTIPLEX_9020_MT=y
|
||||||
|
@ -447,6 +448,8 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
|
||||||
CONFIG_DRIVERS_MC146818=y
|
CONFIG_DRIVERS_MC146818=y
|
||||||
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
||||||
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
||||||
|
CONFIG_MEMORY_MAPPED_TPM=y
|
||||||
|
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
|
||||||
# CONFIG_DRIVERS_SIL_3114 is not set
|
# CONFIG_DRIVERS_SIL_3114 is not set
|
||||||
CONFIG_DRIVERS_WIFI_GENERIC=y
|
CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
CONFIG_DRIVERS_MTK_WIFI=y
|
CONFIG_DRIVERS_MTK_WIFI=y
|
||||||
|
@ -471,6 +474,9 @@ CONFIG_DRIVERS_MTK_WIFI=y
|
||||||
# Trusted Platform Module
|
# Trusted Platform Module
|
||||||
#
|
#
|
||||||
CONFIG_NO_TPM=y
|
CONFIG_NO_TPM=y
|
||||||
|
# CONFIG_TPM1 is not set
|
||||||
|
CONFIG_MAINBOARD_HAS_TPM1=y
|
||||||
|
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
|
||||||
CONFIG_PCR_BOOT_MODE=1
|
CONFIG_PCR_BOOT_MODE=1
|
||||||
CONFIG_PCR_HWID=1
|
CONFIG_PCR_HWID=1
|
||||||
CONFIG_PCR_SRTM=2
|
CONFIG_PCR_SRTM=2
|
||||||
|
|
|
@ -132,6 +132,7 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
|
||||||
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
||||||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||||
# CONFIG_CONSOLE_POST is not set
|
# CONFIG_CONSOLE_POST is not set
|
||||||
|
CONFIG_TPM_PIRQ=0x0
|
||||||
# CONFIG_BOARD_DELL_E6400 is not set
|
# CONFIG_BOARD_DELL_E6400 is not set
|
||||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||||
CONFIG_BOARD_DELL_OPTIPLEX_9020_MT=y
|
CONFIG_BOARD_DELL_OPTIPLEX_9020_MT=y
|
||||||
|
@ -443,6 +444,8 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
|
||||||
CONFIG_DRIVERS_MC146818=y
|
CONFIG_DRIVERS_MC146818=y
|
||||||
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
||||||
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
||||||
|
CONFIG_MEMORY_MAPPED_TPM=y
|
||||||
|
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
|
||||||
CONFIG_VGA=y
|
CONFIG_VGA=y
|
||||||
# CONFIG_DRIVERS_SIL_3114 is not set
|
# CONFIG_DRIVERS_SIL_3114 is not set
|
||||||
CONFIG_DRIVERS_WIFI_GENERIC=y
|
CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
|
@ -468,6 +471,9 @@ CONFIG_DRIVERS_MTK_WIFI=y
|
||||||
# Trusted Platform Module
|
# Trusted Platform Module
|
||||||
#
|
#
|
||||||
CONFIG_NO_TPM=y
|
CONFIG_NO_TPM=y
|
||||||
|
# CONFIG_TPM1 is not set
|
||||||
|
CONFIG_MAINBOARD_HAS_TPM1=y
|
||||||
|
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
|
||||||
CONFIG_PCR_BOOT_MODE=1
|
CONFIG_PCR_BOOT_MODE=1
|
||||||
CONFIG_PCR_HWID=1
|
CONFIG_PCR_HWID=1
|
||||||
CONFIG_PCR_SRTM=2
|
CONFIG_PCR_SRTM=2
|
||||||
|
|
|
@ -135,6 +135,7 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
|
||||||
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
||||||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||||
# CONFIG_CONSOLE_POST is not set
|
# CONFIG_CONSOLE_POST is not set
|
||||||
|
CONFIG_TPM_PIRQ=0x0
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
||||||
|
@ -458,6 +459,8 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
|
||||||
CONFIG_DRIVERS_MC146818=y
|
CONFIG_DRIVERS_MC146818=y
|
||||||
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
||||||
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
||||||
|
CONFIG_MEMORY_MAPPED_TPM=y
|
||||||
|
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
|
||||||
# CONFIG_DRIVERS_SIL_3114 is not set
|
# CONFIG_DRIVERS_SIL_3114 is not set
|
||||||
CONFIG_DRIVERS_WIFI_GENERIC=y
|
CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
# end of Generic Drivers
|
# end of Generic Drivers
|
||||||
|
@ -481,6 +484,9 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
# Trusted Platform Module
|
# Trusted Platform Module
|
||||||
#
|
#
|
||||||
CONFIG_NO_TPM=y
|
CONFIG_NO_TPM=y
|
||||||
|
# CONFIG_TPM1 is not set
|
||||||
|
CONFIG_MAINBOARD_HAS_TPM1=y
|
||||||
|
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
|
||||||
CONFIG_PCR_BOOT_MODE=1
|
CONFIG_PCR_BOOT_MODE=1
|
||||||
CONFIG_PCR_HWID=1
|
CONFIG_PCR_HWID=1
|
||||||
CONFIG_PCR_SRTM=2
|
CONFIG_PCR_SRTM=2
|
||||||
|
|
|
@ -133,6 +133,7 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
|
||||||
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
||||||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||||
# CONFIG_CONSOLE_POST is not set
|
# CONFIG_CONSOLE_POST is not set
|
||||||
|
CONFIG_TPM_PIRQ=0x0
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
||||||
|
@ -454,6 +455,8 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
|
||||||
CONFIG_DRIVERS_MC146818=y
|
CONFIG_DRIVERS_MC146818=y
|
||||||
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
||||||
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
||||||
|
CONFIG_MEMORY_MAPPED_TPM=y
|
||||||
|
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
|
||||||
CONFIG_VGA=y
|
CONFIG_VGA=y
|
||||||
# CONFIG_DRIVERS_SIL_3114 is not set
|
# CONFIG_DRIVERS_SIL_3114 is not set
|
||||||
CONFIG_DRIVERS_WIFI_GENERIC=y
|
CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
|
@ -478,6 +481,9 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
# Trusted Platform Module
|
# Trusted Platform Module
|
||||||
#
|
#
|
||||||
CONFIG_NO_TPM=y
|
CONFIG_NO_TPM=y
|
||||||
|
# CONFIG_TPM1 is not set
|
||||||
|
CONFIG_MAINBOARD_HAS_TPM1=y
|
||||||
|
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
|
||||||
CONFIG_PCR_BOOT_MODE=1
|
CONFIG_PCR_BOOT_MODE=1
|
||||||
CONFIG_PCR_HWID=1
|
CONFIG_PCR_HWID=1
|
||||||
CONFIG_PCR_SRTM=2
|
CONFIG_PCR_SRTM=2
|
||||||
|
|
|
@ -135,6 +135,7 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
|
||||||
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
||||||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||||
# CONFIG_CONSOLE_POST is not set
|
# CONFIG_CONSOLE_POST is not set
|
||||||
|
CONFIG_TPM_PIRQ=0x0
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
||||||
|
@ -458,6 +459,8 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
|
||||||
CONFIG_DRIVERS_MC146818=y
|
CONFIG_DRIVERS_MC146818=y
|
||||||
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
||||||
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
||||||
|
CONFIG_MEMORY_MAPPED_TPM=y
|
||||||
|
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
|
||||||
# CONFIG_DRIVERS_SIL_3114 is not set
|
# CONFIG_DRIVERS_SIL_3114 is not set
|
||||||
CONFIG_DRIVERS_WIFI_GENERIC=y
|
CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
# end of Generic Drivers
|
# end of Generic Drivers
|
||||||
|
@ -481,6 +484,9 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
# Trusted Platform Module
|
# Trusted Platform Module
|
||||||
#
|
#
|
||||||
CONFIG_NO_TPM=y
|
CONFIG_NO_TPM=y
|
||||||
|
# CONFIG_TPM1 is not set
|
||||||
|
CONFIG_MAINBOARD_HAS_TPM1=y
|
||||||
|
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
|
||||||
CONFIG_PCR_BOOT_MODE=1
|
CONFIG_PCR_BOOT_MODE=1
|
||||||
CONFIG_PCR_HWID=1
|
CONFIG_PCR_HWID=1
|
||||||
CONFIG_PCR_SRTM=2
|
CONFIG_PCR_SRTM=2
|
||||||
|
|
|
@ -133,6 +133,7 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
|
||||||
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
||||||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||||
# CONFIG_CONSOLE_POST is not set
|
# CONFIG_CONSOLE_POST is not set
|
||||||
|
CONFIG_TPM_PIRQ=0x0
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
||||||
|
@ -454,6 +455,8 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
|
||||||
CONFIG_DRIVERS_MC146818=y
|
CONFIG_DRIVERS_MC146818=y
|
||||||
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
||||||
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
||||||
|
CONFIG_MEMORY_MAPPED_TPM=y
|
||||||
|
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
|
||||||
CONFIG_VGA=y
|
CONFIG_VGA=y
|
||||||
# CONFIG_DRIVERS_SIL_3114 is not set
|
# CONFIG_DRIVERS_SIL_3114 is not set
|
||||||
CONFIG_DRIVERS_WIFI_GENERIC=y
|
CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
|
@ -478,6 +481,9 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
# Trusted Platform Module
|
# Trusted Platform Module
|
||||||
#
|
#
|
||||||
CONFIG_NO_TPM=y
|
CONFIG_NO_TPM=y
|
||||||
|
# CONFIG_TPM1 is not set
|
||||||
|
CONFIG_MAINBOARD_HAS_TPM1=y
|
||||||
|
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
|
||||||
CONFIG_PCR_BOOT_MODE=1
|
CONFIG_PCR_BOOT_MODE=1
|
||||||
CONFIG_PCR_HWID=1
|
CONFIG_PCR_HWID=1
|
||||||
CONFIG_PCR_SRTM=2
|
CONFIG_PCR_SRTM=2
|
||||||
|
|
|
@ -134,6 +134,7 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
|
||||||
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
||||||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||||
# CONFIG_CONSOLE_POST is not set
|
# CONFIG_CONSOLE_POST is not set
|
||||||
|
CONFIG_TPM_PIRQ=0x0
|
||||||
# CONFIG_BOARD_DELL_E6400 is not set
|
# CONFIG_BOARD_DELL_E6400 is not set
|
||||||
CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF=y
|
CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF=y
|
||||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||||
|
@ -447,6 +448,8 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
|
||||||
CONFIG_DRIVERS_MC146818=y
|
CONFIG_DRIVERS_MC146818=y
|
||||||
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
||||||
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
||||||
|
CONFIG_MEMORY_MAPPED_TPM=y
|
||||||
|
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
|
||||||
# CONFIG_DRIVERS_SIL_3114 is not set
|
# CONFIG_DRIVERS_SIL_3114 is not set
|
||||||
CONFIG_DRIVERS_WIFI_GENERIC=y
|
CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
CONFIG_DRIVERS_MTK_WIFI=y
|
CONFIG_DRIVERS_MTK_WIFI=y
|
||||||
|
@ -471,6 +474,9 @@ CONFIG_DRIVERS_MTK_WIFI=y
|
||||||
# Trusted Platform Module
|
# Trusted Platform Module
|
||||||
#
|
#
|
||||||
CONFIG_NO_TPM=y
|
CONFIG_NO_TPM=y
|
||||||
|
# CONFIG_TPM1 is not set
|
||||||
|
CONFIG_MAINBOARD_HAS_TPM1=y
|
||||||
|
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
|
||||||
CONFIG_PCR_BOOT_MODE=1
|
CONFIG_PCR_BOOT_MODE=1
|
||||||
CONFIG_PCR_HWID=1
|
CONFIG_PCR_HWID=1
|
||||||
CONFIG_PCR_SRTM=2
|
CONFIG_PCR_SRTM=2
|
||||||
|
|
|
@ -132,6 +132,7 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
|
||||||
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
||||||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||||
# CONFIG_CONSOLE_POST is not set
|
# CONFIG_CONSOLE_POST is not set
|
||||||
|
CONFIG_TPM_PIRQ=0x0
|
||||||
# CONFIG_BOARD_DELL_E6400 is not set
|
# CONFIG_BOARD_DELL_E6400 is not set
|
||||||
CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF=y
|
CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF=y
|
||||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||||
|
@ -443,6 +444,8 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
|
||||||
CONFIG_DRIVERS_MC146818=y
|
CONFIG_DRIVERS_MC146818=y
|
||||||
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
||||||
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
||||||
|
CONFIG_MEMORY_MAPPED_TPM=y
|
||||||
|
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
|
||||||
CONFIG_VGA=y
|
CONFIG_VGA=y
|
||||||
# CONFIG_DRIVERS_SIL_3114 is not set
|
# CONFIG_DRIVERS_SIL_3114 is not set
|
||||||
CONFIG_DRIVERS_WIFI_GENERIC=y
|
CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
|
@ -468,6 +471,9 @@ CONFIG_DRIVERS_MTK_WIFI=y
|
||||||
# Trusted Platform Module
|
# Trusted Platform Module
|
||||||
#
|
#
|
||||||
CONFIG_NO_TPM=y
|
CONFIG_NO_TPM=y
|
||||||
|
# CONFIG_TPM1 is not set
|
||||||
|
CONFIG_MAINBOARD_HAS_TPM1=y
|
||||||
|
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
|
||||||
CONFIG_PCR_BOOT_MODE=1
|
CONFIG_PCR_BOOT_MODE=1
|
||||||
CONFIG_PCR_HWID=1
|
CONFIG_PCR_HWID=1
|
||||||
CONFIG_PCR_SRTM=2
|
CONFIG_PCR_SRTM=2
|
||||||
|
|
|
@ -135,6 +135,7 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
|
||||||
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
||||||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||||
# CONFIG_CONSOLE_POST is not set
|
# CONFIG_CONSOLE_POST is not set
|
||||||
|
CONFIG_TPM_PIRQ=0x0
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
||||||
|
@ -458,6 +459,8 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
|
||||||
CONFIG_DRIVERS_MC146818=y
|
CONFIG_DRIVERS_MC146818=y
|
||||||
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
||||||
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
||||||
|
CONFIG_MEMORY_MAPPED_TPM=y
|
||||||
|
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
|
||||||
# CONFIG_DRIVERS_SIL_3114 is not set
|
# CONFIG_DRIVERS_SIL_3114 is not set
|
||||||
CONFIG_DRIVERS_WIFI_GENERIC=y
|
CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
# end of Generic Drivers
|
# end of Generic Drivers
|
||||||
|
@ -481,6 +484,9 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
# Trusted Platform Module
|
# Trusted Platform Module
|
||||||
#
|
#
|
||||||
CONFIG_NO_TPM=y
|
CONFIG_NO_TPM=y
|
||||||
|
# CONFIG_TPM1 is not set
|
||||||
|
CONFIG_MAINBOARD_HAS_TPM1=y
|
||||||
|
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
|
||||||
CONFIG_PCR_BOOT_MODE=1
|
CONFIG_PCR_BOOT_MODE=1
|
||||||
CONFIG_PCR_HWID=1
|
CONFIG_PCR_HWID=1
|
||||||
CONFIG_PCR_SRTM=2
|
CONFIG_PCR_SRTM=2
|
||||||
|
|
|
@ -133,6 +133,7 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
|
||||||
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
||||||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||||
# CONFIG_CONSOLE_POST is not set
|
# CONFIG_CONSOLE_POST is not set
|
||||||
|
CONFIG_TPM_PIRQ=0x0
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
||||||
|
@ -454,6 +455,8 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
|
||||||
CONFIG_DRIVERS_MC146818=y
|
CONFIG_DRIVERS_MC146818=y
|
||||||
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
||||||
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
||||||
|
CONFIG_MEMORY_MAPPED_TPM=y
|
||||||
|
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
|
||||||
CONFIG_VGA=y
|
CONFIG_VGA=y
|
||||||
# CONFIG_DRIVERS_SIL_3114 is not set
|
# CONFIG_DRIVERS_SIL_3114 is not set
|
||||||
CONFIG_DRIVERS_WIFI_GENERIC=y
|
CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
|
@ -478,6 +481,9 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
# Trusted Platform Module
|
# Trusted Platform Module
|
||||||
#
|
#
|
||||||
CONFIG_NO_TPM=y
|
CONFIG_NO_TPM=y
|
||||||
|
# CONFIG_TPM1 is not set
|
||||||
|
CONFIG_MAINBOARD_HAS_TPM1=y
|
||||||
|
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
|
||||||
CONFIG_PCR_BOOT_MODE=1
|
CONFIG_PCR_BOOT_MODE=1
|
||||||
CONFIG_PCR_HWID=1
|
CONFIG_PCR_HWID=1
|
||||||
CONFIG_PCR_SRTM=2
|
CONFIG_PCR_SRTM=2
|
||||||
|
|
|
@ -135,6 +135,7 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
|
||||||
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
||||||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||||
# CONFIG_CONSOLE_POST is not set
|
# CONFIG_CONSOLE_POST is not set
|
||||||
|
CONFIG_TPM_PIRQ=0x0
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
||||||
|
@ -458,6 +459,8 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
|
||||||
CONFIG_DRIVERS_MC146818=y
|
CONFIG_DRIVERS_MC146818=y
|
||||||
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
||||||
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
||||||
|
CONFIG_MEMORY_MAPPED_TPM=y
|
||||||
|
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
|
||||||
# CONFIG_DRIVERS_SIL_3114 is not set
|
# CONFIG_DRIVERS_SIL_3114 is not set
|
||||||
CONFIG_DRIVERS_WIFI_GENERIC=y
|
CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
# end of Generic Drivers
|
# end of Generic Drivers
|
||||||
|
@ -481,6 +484,9 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
# Trusted Platform Module
|
# Trusted Platform Module
|
||||||
#
|
#
|
||||||
CONFIG_NO_TPM=y
|
CONFIG_NO_TPM=y
|
||||||
|
# CONFIG_TPM1 is not set
|
||||||
|
CONFIG_MAINBOARD_HAS_TPM1=y
|
||||||
|
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
|
||||||
CONFIG_PCR_BOOT_MODE=1
|
CONFIG_PCR_BOOT_MODE=1
|
||||||
CONFIG_PCR_HWID=1
|
CONFIG_PCR_HWID=1
|
||||||
CONFIG_PCR_SRTM=2
|
CONFIG_PCR_SRTM=2
|
||||||
|
|
|
@ -133,6 +133,7 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
|
||||||
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
|
||||||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||||
# CONFIG_CONSOLE_POST is not set
|
# CONFIG_CONSOLE_POST is not set
|
||||||
|
CONFIG_TPM_PIRQ=0x0
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
|
||||||
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
# CONFIG_BOARD_DELL_LATITUDE_E5530 is not set
|
||||||
|
@ -454,6 +455,8 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
|
||||||
CONFIG_DRIVERS_MC146818=y
|
CONFIG_DRIVERS_MC146818=y
|
||||||
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
|
||||||
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
|
||||||
|
CONFIG_MEMORY_MAPPED_TPM=y
|
||||||
|
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
|
||||||
CONFIG_VGA=y
|
CONFIG_VGA=y
|
||||||
# CONFIG_DRIVERS_SIL_3114 is not set
|
# CONFIG_DRIVERS_SIL_3114 is not set
|
||||||
CONFIG_DRIVERS_WIFI_GENERIC=y
|
CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
|
@ -478,6 +481,9 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
|
||||||
# Trusted Platform Module
|
# Trusted Platform Module
|
||||||
#
|
#
|
||||||
CONFIG_NO_TPM=y
|
CONFIG_NO_TPM=y
|
||||||
|
# CONFIG_TPM1 is not set
|
||||||
|
CONFIG_MAINBOARD_HAS_TPM1=y
|
||||||
|
# CONFIG_TPM_RDRESP_NEED_DELAY is not set
|
||||||
CONFIG_PCR_BOOT_MODE=1
|
CONFIG_PCR_BOOT_MODE=1
|
||||||
CONFIG_PCR_HWID=1
|
CONFIG_PCR_HWID=1
|
||||||
CONFIG_PCR_SRTM=2
|
CONFIG_PCR_SRTM=2
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
From 355536155898e649fa50277136ccd2df53a52bb1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mate Kukri <kukri.mate@gmail.com>
|
||||||
|
Date: Wed, 10 Apr 2024 20:31:35 +0100
|
||||||
|
Subject: [PATCH 1/1] mb/dell/optiplex_9020: Add support for TPM1.2 device
|
||||||
|
|
||||||
|
These machines come with a TPM1.2 device by default. It is somewhat
|
||||||
|
obsolete these days, but there is no harm in enabling it.
|
||||||
|
|
||||||
|
Change-Id: Iec05321862aed58695c256b00494e5953219786d
|
||||||
|
Signed-off-by: Mate Kukri <kukri.mate@gmail.com>
|
||||||
|
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81827
|
||||||
|
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
|
||||||
|
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
|
||||||
|
---
|
||||||
|
src/mainboard/dell/optiplex_9020/Kconfig | 2 ++
|
||||||
|
src/mainboard/dell/optiplex_9020/devicetree.cb | 3 +++
|
||||||
|
2 files changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/mainboard/dell/optiplex_9020/Kconfig b/src/mainboard/dell/optiplex_9020/Kconfig
|
||||||
|
index 2de4a9abd6..38c3281e70 100644
|
||||||
|
--- a/src/mainboard/dell/optiplex_9020/Kconfig
|
||||||
|
+++ b/src/mainboard/dell/optiplex_9020/Kconfig
|
||||||
|
@@ -12,7 +12,9 @@ config BOARD_SPECIFIC_OPTIONS
|
||||||
|
select INTEL_GMA_HAVE_VBT
|
||||||
|
select INTEL_INT15
|
||||||
|
select MAINBOARD_HAS_LIBGFXINIT
|
||||||
|
+ select MAINBOARD_HAS_TPM1
|
||||||
|
select MAINBOARD_USES_IFD_GBE_REGION
|
||||||
|
+ select MEMORY_MAPPED_TPM
|
||||||
|
select NORTHBRIDGE_INTEL_HASWELL
|
||||||
|
select SERIRQ_CONTINUOUS_MODE
|
||||||
|
select SOUTHBRIDGE_INTEL_LYNXPOINT
|
||||||
|
diff --git a/src/mainboard/dell/optiplex_9020/devicetree.cb b/src/mainboard/dell/optiplex_9020/devicetree.cb
|
||||||
|
index dce5869478..841285bb9c 100644
|
||||||
|
--- a/src/mainboard/dell/optiplex_9020/devicetree.cb
|
||||||
|
+++ b/src/mainboard/dell/optiplex_9020/devicetree.cb
|
||||||
|
@@ -70,6 +70,9 @@ chip northbridge/intel/haswell
|
||||||
|
device pnp 2e.b off end # Floppy Controller
|
||||||
|
device pnp 2e.11 off end # Parallel Port
|
||||||
|
end
|
||||||
|
+ chip drivers/pc80/tpm
|
||||||
|
+ device pnp 0c31.0 on end
|
||||||
|
+ end
|
||||||
|
end
|
||||||
|
device pci 1f.2 on end # SATA controller 1
|
||||||
|
device pci 1f.3 on end # SMBus
|
||||||
|
--
|
||||||
|
2.39.2
|
||||||
|
|
Loading…
Reference in New Issue