mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
bb34e69f3d
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From 48128d2a875a34aeef5b89ed93e2887179534b33 Mon Sep 17 00:00:00 2001
|
|
From: Fabio Estevam <festevam@gmail.com>
|
|
Date: Thu, 5 Jan 2012 12:49:54 -0200
|
|
Subject: [PATCH 050/147] ima: fix Kconfig dependencies
|
|
|
|
commit f4a0391dfa91155bd961673b31eb42d9d45c799d upstream.
|
|
|
|
Fix the following build warning:
|
|
warning: (IMA) selects TCG_TPM which has unmet direct dependencies
|
|
(HAS_IOMEM && EXPERIMENTAL)
|
|
|
|
Suggested-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
|
|
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
|
|
Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
|
|
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/char/tpm/Kconfig | 1 -
|
|
security/integrity/ima/Kconfig | 2 +-
|
|
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
|
|
index fa567f1..c9e045c 100644
|
|
--- a/drivers/char/tpm/Kconfig
|
|
+++ b/drivers/char/tpm/Kconfig
|
|
@@ -5,7 +5,6 @@
|
|
menuconfig TCG_TPM
|
|
tristate "TPM Hardware Support"
|
|
depends on HAS_IOMEM
|
|
- depends on EXPERIMENTAL
|
|
select SECURITYFS
|
|
---help---
|
|
If you have a TPM security chip in your system, which
|
|
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
|
|
index 4f554f2..063298a 100644
|
|
--- a/security/integrity/ima/Kconfig
|
|
+++ b/security/integrity/ima/Kconfig
|
|
@@ -9,7 +9,7 @@ config IMA
|
|
select CRYPTO_HMAC
|
|
select CRYPTO_MD5
|
|
select CRYPTO_SHA1
|
|
- select TCG_TPM if !S390 && !UML
|
|
+ select TCG_TPM if HAS_IOMEM && !UML
|
|
select TCG_TIS if TCG_TPM
|
|
help
|
|
The Trusted Computing Group(TCG) runtime Integrity
|
|
--
|
|
1.7.9.4
|
|
|