tpm: Refactor TPM Kconfig dimensions

Break TPM related Kconfig into the following dimensions:

TPM transport support:
config CRB_TPM
config I2C_TPM
config SPI_TPM
config MEMORY_MAPPED_TPM (new)

TPM brand, not defining any of these is valid, and result in "generic" support:
config TPM_ATMEL (new)
config TPM_GOOGLE (new)
config TPM_GOOGLE_CR50 (new, implies TPM_GOOGLE)
config TPM_GOOGLE_TI50 (new to be used later, implies TPM_GOOGLE)

What protocol the TPM chip supports:
config MAINBOARD_HAS_TPM1
config MAINBOARD_HAS_TPM2

What the user chooses to compile (restricted by the above):
config NO_TPM
config TPM1
config TPM2

The following Kconfigs will be replaced as indicated:
config TPM_CR50 -> TPM_GOOGLE
config MAINBOARD_HAS_CRB_TPM -> CRB_TPM
config MAINBOARD_HAS_I2C_TPM_ATMEL -> I2C_TPM && TPM_ATMEL
config MAINBOARD_HAS_I2C_TPM_CR50 -> I2C_TPM && TPM_GOOGLE
config MAINBOARD_HAS_I2C_TPM_GENERIC -> I2C_TPM && !TPM_GOOGLE && !TPM_ATMEL
config MAINBOARD_HAS_LPC_TPM -> MEMORY_MAPPED_TPM
config MAINBOARD_HAS_SPI_TPM -> SPI_TPM && !TPM_GOOGLE && !TPM_ATMEL
config MAINBOARD_HAS_SPI_TPM_CR50 -> SPI_TPM && TPM_GOOGLE

Signed-off-by: Jes B. Klinke <jbk@chromium.org>
Change-Id: I4656b2b90363b8dfd008dc281ad591862fe2cc9e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63424
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>

3 files changed, 6 insertions, 6 deletions

diff --git a/src/mainboard/asus/am1i-a/Kconfig b/src/mainboard/asus/am1i-a/Kconfig
index 9d2cb16251..9a4c8e3d7a 100644
--- a/src/mainboard/asus/am1i-a/Kconfig
+++ b/src/mainboard/asus/am1i-a/Kconfig
@@ -18,7 +18,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SOUTHBRIDGE_AMD_AGESA_YANGTZE
 	select DEFAULT_POST_ON_LPC
 	select SUPERIO_ITE_IT8623E
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 
 config MAINBOARD_DIR
 	default "asus/am1i-a"
diff --git a/src/mainboard/asus/h61-series/Kconfig.name b/src/mainboard/asus/h61-series/Kconfig.name
index 0956f40c2e..d2175a84f4 100644
--- a/src/mainboard/asus/h61-series/Kconfig.name
+++ b/src/mainboard/asus/h61-series/Kconfig.name
@@ -34,7 +34,7 @@ config BOARD_ASUS_P8H61_M_PRO
 	select DRIVERS_ASMEDIA_ASPM_BLACKLIST
 	select HAVE_CMOS_DEFAULT
 	select HAVE_OPTION_TABLE
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select REALTEK_8168_RESET
 	select RT8168_SET_LED_MODE
 	select SUPERIO_NUVOTON_NCT6776
@@ -46,7 +46,7 @@ config BOARD_ASUS_P8H61_M_PRO_CM6630
 	select DRIVERS_ASMEDIA_ASPM_BLACKLIST
 	select HAVE_CMOS_DEFAULT
 	select HAVE_OPTION_TABLE
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select REALTEK_8168_RESET
 	select RT8168_SET_LED_MODE
 	select SUPERIO_NUVOTON_NCT6776
diff --git a/src/mainboard/asus/p8x7x-series/Kconfig.name b/src/mainboard/asus/p8x7x-series/Kconfig.name
index 822f5d4d45..6f08b48446 100644
--- a/src/mainboard/asus/p8x7x-series/Kconfig.name
+++ b/src/mainboard/asus/p8x7x-series/Kconfig.name
@@ -2,7 +2,7 @@ config BOARD_ASUS_P8C_WS
 	bool "P8C_WS"
 	select BOARD_ASUS_P8X7X_SERIES
 	select BOARD_ROMSIZE_KB_8192
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select SUPERIO_NUVOTON_NCT6776
 	select USE_NATIVE_RAMINIT
 
@@ -18,7 +18,7 @@ config BOARD_ASUS_P8Z77_M_PRO
 	select BOARD_ASUS_P8X7X_SERIES
 	select BOARD_ROMSIZE_KB_8192
 	select DRIVERS_ASMEDIA_ASPM_BLACKLIST # for ASM1061 eSATA
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select SUPERIO_NUVOTON_NCT6779D
 
 config BOARD_ASUS_P8Z77_V_LX2
@@ -34,7 +34,7 @@ config BOARD_ASUS_P8Z77_V
 	select BOARD_ASUS_P8X7X_SERIES
 	select BOARD_ROMSIZE_KB_8192
 	select DRIVERS_ASMEDIA_ASPM_BLACKLIST # for ASM1061 eSATA
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select SUPERIO_NUVOTON_NCT6779D
 	select USE_NATIVE_RAMINIT