aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-10-28 16:51:58 +0200
committerGitHub <noreply@github.com>2016-10-28 16:51:58 +0200
commit70ac526818a8f8ae03676dc6d0421fc022123ac3 (patch)
tree5ab420d0e8891bf659155281c2d2d9dd1dcb3cbe /target
parentce116bc6f997d8d6e6b976cacce5d4c60d705fc6 (diff)
parentc718b120e06d9b5c9784242291a7b0535cabda34 (diff)
downloadmaster-187ad058-70ac526818a8f8ae03676dc6d0421fc022123ac3.tar.gz
master-187ad058-70ac526818a8f8ae03676dc6d0421fc022123ac3.tar.bz2
master-187ad058-70ac526818a8f8ae03676dc6d0421fc022123ac3.zip
Merge pull request #131 from Ham22/tpm
add tpm support
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/config-3.1810
-rw-r--r--target/linux/generic/config-4.111
-rw-r--r--target/linux/generic/config-4.411
3 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index b4e283efe0..746fe8cf73 100644
--- a/target/linux/generic/config-3.18
+++ b/target/linux/generic/config-3.18
@@ -3894,6 +3894,16 @@ CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_TASKS_RCU is not set
# CONFIG_TC35815 is not set
# CONFIG_TCG_TPM is not set
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_TIS_I2C_ATMEL is not set
+# CONFIG_TCG_TIS_I2C_INFINEON is not set
+# CONFIG_TCG_TIS_I2C_NUVOTON is not set
+# CONFIG_TCG_NSC is not set
+# CONFIG_TCG_ATMEL is not set
+# CONFIG_TCG_INFINEON is not set
+# CONFIG_TCG_IBMVTPM is not set
+# CONFIG_TCG_ST33_I2C is not set
+# CONFIG_TCG_XEN is not set
# CONFIG_TCIC is not set
CONFIG_TCP_CONG_ADVANCED=y
# CONFIG_TCP_CONG_BIC is not set
diff --git a/target/linux/generic/config-4.1 b/target/linux/generic/config-4.1
index eb2c249cb0..1fc0056605 100644
--- a/target/linux/generic/config-4.1
+++ b/target/linux/generic/config-4.1
@@ -4053,6 +4053,17 @@ CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_TASKS_RCU is not set
# CONFIG_TC35815 is not set
# CONFIG_TCG_TPM is not set
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_TIS_I2C_ATMEL is not set
+# CONFIG_TCG_TIS_I2C_INFINEON is not set
+# CONFIG_TCG_TIS_I2C_NUVOTON is not set
+# CONFIG_TCG_NSC is not set
+# CONFIG_TCG_ATMEL is not set
+# CONFIG_TCG_INFINEON is not set
+# CONFIG_TCG_IBMVTPM is not set
+# CONFIG_TCG_TIS_ST33ZP24 is not set
+# CONFIG_TCG_XEN is not set
+# CONFIG_TCG_CRB is not set
# CONFIG_TCIC is not set
CONFIG_TCP_CONG_ADVANCED=y
# CONFIG_TCP_CONG_BIC is not set
diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4
index 24b8c48e6f..3844f063b5 100644
--- a/target/linux/generic/config-4.4
+++ b/target/linux/generic/config-4.4
@@ -4065,6 +4065,17 @@ CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_TASKS_RCU is not set
# CONFIG_TC35815 is not set
# CONFIG_TCG_TPM is not set
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_TIS_I2C_ATMEL is not set
+# CONFIG_TCG_TIS_I2C_INFINEON is not set
+# CONFIG_TCG_TIS_I2C_NUVOTON is not set
+# CONFIG_TCG_NSC is not set
+# CONFIG_TCG_ATMEL is not set
+# CONFIG_TCG_INFINEON is not set
+# CONFIG_TCG_IBMVTPM is not set
+# CONFIG_TCG_TIS_ST33ZP24 is not set
+# CONFIG_TCG_XEN is not set
+# CONFIG_TCG_CRB is not set
# CONFIG_TCIC is not set
CONFIG_TCP_CONG_ADVANCED=y
# CONFIG_TCP_CONG_BIC is not set