diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-31 11:43:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-31 11:43:47 -0400 |
| commit | 80cd58b99e8690b05e8537dbf76276e24fcfa652 (patch) | |
| tree | 0684c14480ab87bb3a74c1c70275b5fdc9c8e3c9 /include/configs | |
| parent | 7c0e5d865ff0b86dfce492b656238919c659d756 (diff) | |
| parent | 897705ec39682ab3bf5bb87bc49d7a491d522051 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/controlcenterd.h | 7 | ||||
| -rw-r--r-- | include/configs/efi-x86.h | 2 | ||||
| -rw-r--r-- | include/configs/exynos5-common.h | 7 | ||||
| -rw-r--r-- | include/configs/x86-common.h | 2 |
4 files changed, 0 insertions, 18 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 e710f41f79..4866836d55 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -54,13 +54,6 @@ #define CONFIG_CMD_DTT #define CONFIG_TMU_CMD_DTT -/* TPM */ -#define CONFIG_TPM -#define CONFIG_CMD_TPM -#define CONFIG_TPM_TIS_I2C -#define CONFIG_TPM_TIS_I2C_BUS_NUMBER 3 -#define CONFIG_TPM_TIS_I2C_SLAVE_ADDR 0x20 - /* 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 /*----------------------------------------------------------------------- |