summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-08-22 18:31:20 -0600
committerSimon Glass <sjg@chromium.org>2015-08-31 07:57:27 -0600
commit26468d5186b437eba0c4baf9b7ac0e4b9b18ad39 (patch)
tree5b8057287b5288be86a1ed4bd78c35a6aafb4318 /include
parenta7d660bc4982fea59d14d30eb79e77499d1074ef (diff)
downloadblackbird-obmc-uboot-26468d5186b437eba0c4baf9b7ac0e4b9b18ad39.tar.gz
blackbird-obmc-uboot-26468d5186b437eba0c4baf9b7ac0e4b9b18ad39.zip
tpm: Convert board config TPM options to Kconfig
Convert all TPM options to Kconfig and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'include')
-rw-r--r--include/configs/controlcenterd.h7
-rw-r--r--include/configs/efi-x86.h2
-rw-r--r--include/configs/exynos5-common.h5
-rw-r--r--include/configs/x86-common.h2
4 files changed, 0 insertions, 16 deletions
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 8f829eddb1..9a1f6d0782 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -226,14 +226,7 @@
#define CONFIG_SF_DEFAULT_MODE 0
#endif
-/*
- * TPM
- */
-#define CONFIG_TPM_ATMEL_TWI
-#define CONFIG_TPM
-#define CONFIG_TPM_AUTH_SESSIONS
#define CONFIG_SHA1
-#define CONFIG_CMD_TPM
/*
* MMC
diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h
index 5779cfdb66..1c955d9e37 100644
--- a/include/configs/efi-x86.h
+++ b/include/configs/efi-x86.h
@@ -11,8 +11,6 @@
#undef CONFIG_CMD_SF_TEST
-#undef CONFIG_TPM
-#undef CONFIG_TPM_TIS_LPC
#undef CONFIG_TPM_TIS_BASE_ADDRESS
#undef CONFIG_CMD_IMLS
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index fb5ee0d39a..4866836d55 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -54,11 +54,6 @@
#define CONFIG_CMD_DTT
#define CONFIG_TMU_CMD_DTT
-/* TPM */
-#define CONFIG_TPM
-#define CONFIG_CMD_TPM
-#define CONFIG_TPM_TIS_I2C
-
/* MMC SPL */
#define COPY_BL2_FNPTR_ADDR 0x02020030
#define CONFIG_SUPPORT_EMMC_BOOT
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 217312e5b7..3f153f24ae 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -47,8 +47,6 @@
#endif
/* Generic TPM interfaced through LPC bus */
-#define CONFIG_TPM
-#define CONFIG_TPM_TIS_LPC
#define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000
/*-----------------------------------------------------------------------
OpenPOWER on IntegriCloud