summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-06-05 08:55:35 -0400
committerTom Rini <trini@ti.com>2013-06-05 08:55:35 -0400
commit1318d00e5894ac55bc6b7297f3eda97983b79fae (patch)
tree61af0fa9a78277998455eac609bb72d4a2058ea2 /include
parent99bd544ee76af3302b8421eaaddfe61f56915fc6 (diff)
parent1b393db5870927d68c42a46e6c5877c8d0d83910 (diff)
downloadu-boot-imx-1318d00e5894ac55bc6b7297f3eda97983b79fae.zip
u-boot-imx-1318d00e5894ac55bc6b7297f3eda97983b79fae.tar.gz
u-boot-imx-1318d00e5894ac55bc6b7297f3eda97983b79fae.tar.bz2
Merge branch 'tpm' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'include')
-rw-r--r--include/configs/coreboot.h3
-rw-r--r--include/configs/exynos5250-dt.h6
-rw-r--r--include/fdtdec.h1
3 files changed, 6 insertions, 4 deletions
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index be04a75..2fefdc8 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -90,7 +90,8 @@
#endif
/* Generic TPM interfaced through LPC bus */
-#define CONFIG_GENERIC_LPC_TPM
+#define CONFIG_TPM
+#define CONFIG_TPM_TIS_LPC
#define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000
/*-----------------------------------------------------------------------
diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h
index 8a82892..41d6cf9 100644
--- a/include/configs/exynos5250-dt.h
+++ b/include/configs/exynos5250-dt.h
@@ -142,9 +142,9 @@
/* TPM */
#define CONFIG_TPM
#define CONFIG_CMD_TPM
-#define CONFIG_INFINEON_TPM_I2C
-#define CONFIG_INFINEON_TPM_I2C_BUS 3
-#define CONFIG_INFINEON_TPM_I2C_ADDR 0x20
+#define CONFIG_TPM_TIS_I2C
+#define CONFIG_TPM_TIS_I2C_BUS_NUMBER 3
+#define CONFIG_TPM_TIS_I2C_SLAVE_ADDR 0x20
/* MMC SPL */
#define CONFIG_SPL
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 4e8032b..1ece612 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -93,6 +93,7 @@ enum fdt_compat_id {
COMPAT_GENERIC_SPI_FLASH, /* Generic SPI Flash chip */
COMPAT_MAXIM_98095_CODEC, /* MAX98095 Codec */
COMPAT_INFINEON_SLB9635_TPM, /* Infineon SLB9635 TPM */
+ COMPAT_INFINEON_SLB9645_TPM, /* Infineon SLB9645 TPM */
COMPAT_COUNT,
};