Use menuconfig objects II - TPM
Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Cc: Kylene Hall <kjhall@us.ibm.com> Cc: Marcel Selhorst <tpm@selhorst.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
79e508a4b8
commit
7126b75c87
|
@ -2,11 +2,9 @@
|
||||||
# TPM device configuration
|
# TPM device configuration
|
||||||
#
|
#
|
||||||
|
|
||||||
menu "TPM devices"
|
menuconfig TCG_TPM
|
||||||
depends on HAS_IOMEM
|
|
||||||
|
|
||||||
config TCG_TPM
|
|
||||||
tristate "TPM Hardware Support"
|
tristate "TPM Hardware Support"
|
||||||
|
depends on HAS_IOMEM
|
||||||
depends on EXPERIMENTAL
|
depends on EXPERIMENTAL
|
||||||
---help---
|
---help---
|
||||||
If you have a TPM security chip in your system, which
|
If you have a TPM security chip in your system, which
|
||||||
|
@ -21,9 +19,11 @@ config TCG_TPM
|
||||||
Note: For more TPM drivers enable CONFIG_PNP, CONFIG_ACPI
|
Note: For more TPM drivers enable CONFIG_PNP, CONFIG_ACPI
|
||||||
and CONFIG_PNPACPI.
|
and CONFIG_PNPACPI.
|
||||||
|
|
||||||
|
if TCG_TPM
|
||||||
|
|
||||||
config TCG_TIS
|
config TCG_TIS
|
||||||
tristate "TPM Interface Specification 1.2 Interface"
|
tristate "TPM Interface Specification 1.2 Interface"
|
||||||
depends on TCG_TPM && PNPACPI
|
depends on PNPACPI
|
||||||
---help---
|
---help---
|
||||||
If you have a TPM security chip that is compliant with the
|
If you have a TPM security chip that is compliant with the
|
||||||
TCG TIS 1.2 TPM specification say Yes and it will be accessible
|
TCG TIS 1.2 TPM specification say Yes and it will be accessible
|
||||||
|
@ -32,7 +32,7 @@ config TCG_TIS
|
||||||
|
|
||||||
config TCG_NSC
|
config TCG_NSC
|
||||||
tristate "National Semiconductor TPM Interface"
|
tristate "National Semiconductor TPM Interface"
|
||||||
depends on TCG_TPM && PNPACPI
|
depends on PNPACPI
|
||||||
---help---
|
---help---
|
||||||
If you have a TPM security chip from National Semiconductor
|
If you have a TPM security chip from National Semiconductor
|
||||||
say Yes and it will be accessible from within Linux. To
|
say Yes and it will be accessible from within Linux. To
|
||||||
|
@ -41,7 +41,6 @@ config TCG_NSC
|
||||||
|
|
||||||
config TCG_ATMEL
|
config TCG_ATMEL
|
||||||
tristate "Atmel TPM Interface"
|
tristate "Atmel TPM Interface"
|
||||||
depends on TCG_TPM
|
|
||||||
---help---
|
---help---
|
||||||
If you have a TPM security chip from Atmel say Yes and it
|
If you have a TPM security chip from Atmel say Yes and it
|
||||||
will be accessible from within Linux. To compile this driver
|
will be accessible from within Linux. To compile this driver
|
||||||
|
@ -49,7 +48,7 @@ config TCG_ATMEL
|
||||||
|
|
||||||
config TCG_INFINEON
|
config TCG_INFINEON
|
||||||
tristate "Infineon Technologies TPM Interface"
|
tristate "Infineon Technologies TPM Interface"
|
||||||
depends on TCG_TPM && PNPACPI
|
depends on PNPACPI
|
||||||
---help---
|
---help---
|
||||||
If you have a TPM security chip from Infineon Technologies
|
If you have a TPM security chip from Infineon Technologies
|
||||||
(either SLD 9630 TT 1.1 or SLB 9635 TT 1.2) say Yes and it
|
(either SLD 9630 TT 1.1 or SLB 9635 TT 1.2) say Yes and it
|
||||||
|
@ -59,5 +58,4 @@ config TCG_INFINEON
|
||||||
Further information on this driver and the supported hardware
|
Further information on this driver and the supported hardware
|
||||||
can be found at http://www.prosec.rub.de/tpm
|
can be found at http://www.prosec.rub.de/tpm
|
||||||
|
|
||||||
endmenu
|
endif # TCG_TPM
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue