ia64/xen-unstable

changeset 6579:06b1cbe76880

VTPM is off by default.
author kaf24@firebug.cl.cam.ac.uk
date Thu Sep 01 09:01:15 2005 +0000 (2005-09-01)
parents a11bf3a68e9b
children b99098e3c2ed
files Config.mk linux-2.6-xen-sparse/arch/xen/Kconfig linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64 linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32 linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64 tools/Makefile
line diff
     1.1 --- a/Config.mk	Thu Sep 01 08:11:16 2005 +0000
     1.2 +++ b/Config.mk	Thu Sep 01 09:01:15 2005 +0000
     1.3 @@ -48,3 +48,4 @@ ACM_USE_SECURITY_POLICY ?= ACM_NULL_POLI
     1.4  # Optional components
     1.5  XENSTAT_XENTOP ?= y
     1.6  
     1.7 +VTPM_TOOLS ?= n
     2.1 --- a/linux-2.6-xen-sparse/arch/xen/Kconfig	Thu Sep 01 08:11:16 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/Kconfig	Thu Sep 01 09:01:15 2005 +0000
     2.3 @@ -72,7 +72,7 @@ config XEN_NETDEV_BACKEND
     2.4  
     2.5  config XEN_TPMDEV_FRONTEND
     2.6          bool "TPM-device frontend driver"
     2.7 -        default y
     2.8 +        default n
     2.9          help
    2.10            The TPM-device frontend driver.
    2.11  
     3.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32	Thu Sep 01 08:11:16 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32	Thu Sep 01 09:01:15 2005 +0000
     3.3 @@ -16,8 +16,7 @@ CONFIG_XEN_BLKDEV_BACKEND=y
     3.4  # CONFIG_XEN_BLKDEV_TAP_BE is not set
     3.5  CONFIG_XEN_NETDEV_BACKEND=y
     3.6  # CONFIG_XEN_TPMDEV_FRONTEND is not set
     3.7 -CONFIG_XEN_TPMDEV_BACKEND=y
     3.8 -# CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS is not set
     3.9 +# CONFIG_XEN_TPMDEV_BACKEND is not set
    3.10  CONFIG_XEN_BLKDEV_FRONTEND=y
    3.11  CONFIG_XEN_NETDEV_FRONTEND=y
    3.12  CONFIG_XEN_NETDEV_GRANT_TX=y
    3.13 @@ -855,9 +854,7 @@ CONFIG_DRM_SIS=m
    3.14  #
    3.15  # TPM devices
    3.16  #
    3.17 -CONFIG_TCG_TPM=m
    3.18 -CONFIG_TCG_NSC=m
    3.19 -CONFIG_TCG_ATMEL=m
    3.20 +# CONFIG_TCG_TPM is not set
    3.21  
    3.22  #
    3.23  # I2C support
     4.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64	Thu Sep 01 08:11:16 2005 +0000
     4.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64	Thu Sep 01 09:01:15 2005 +0000
     4.3 @@ -15,9 +15,8 @@ CONFIG_XEN_PHYSDEV_ACCESS=y
     4.4  CONFIG_XEN_BLKDEV_BACKEND=y
     4.5  # CONFIG_XEN_BLKDEV_TAP_BE is not set
     4.6  CONFIG_XEN_NETDEV_BACKEND=y
     4.7 +# CONFIG_XEN_TPMDEV_FRONTEND is not set
     4.8  # CONFIG_XEN_TPMDEV_BACKEND is not set
     4.9 -# CONFIG_XEN_TPMDEV_FRONTEND is not set
    4.10 -# CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS is not set
    4.11  CONFIG_XEN_BLKDEV_FRONTEND=y
    4.12  CONFIG_XEN_NETDEV_FRONTEND=y
    4.13  CONFIG_XEN_NETDEV_GRANT_TX=y
    4.14 @@ -762,9 +761,7 @@ CONFIG_DRM_SIS=m
    4.15  #
    4.16  # TPM devices
    4.17  #
    4.18 -CONFIG_TCG_TPM=m
    4.19 -CONFIG_TCG_NSC=m
    4.20 -CONFIG_TCG_ATMEL=m
    4.21 +# CONFIG_TCG_TPM is not set
    4.22  
    4.23  #
    4.24  # I2C support
     5.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32	Thu Sep 01 08:11:16 2005 +0000
     5.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32	Thu Sep 01 09:01:15 2005 +0000
     5.3 @@ -12,7 +12,7 @@ CONFIG_NO_IDLE_HZ=y
     5.4  #
     5.5  # CONFIG_XEN_PRIVILEGED_GUEST is not set
     5.6  # CONFIG_XEN_PHYSDEV_ACCESS is not set
     5.7 -CONFIG_XEN_TPMDEV_FRONTEND=y
     5.8 +# CONFIG_XEN_TPMDEV_FRONTEND is not set
     5.9  # CONFIG_XEN_TPMDEV_BACKEND is not set
    5.10  CONFIG_XEN_BLKDEV_FRONTEND=y
    5.11  CONFIG_XEN_NETDEV_FRONTEND=y
    5.12 @@ -338,8 +338,7 @@ CONFIG_NETDEVICES=y
    5.13  CONFIG_UNIX98_PTYS=y
    5.14  CONFIG_LEGACY_PTYS=y
    5.15  CONFIG_LEGACY_PTY_COUNT=256
    5.16 -CONFIG_TCG_TPM=y
    5.17 -CONFIG_TCG_XEN=y
    5.18 +# CONFIG_TCG_TPM is not set
    5.19  
    5.20  #
    5.21  # Character devices
     6.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64	Thu Sep 01 08:11:16 2005 +0000
     6.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64	Thu Sep 01 09:01:15 2005 +0000
     6.3 @@ -664,8 +664,7 @@ CONFIG_NETCONSOLE=m
     6.4  CONFIG_INPUT=m
     6.5  CONFIG_UNIX98_PTYS=y
     6.6  # CONFIG_LEGACY_PTYS is not set
     6.7 -CONFIG_TCG_TPM=y
     6.8 -CONFIG_TCG_XEN=y
     6.9 +# CONFIG_TCG_TPM is not set
    6.10  
    6.11  #
    6.12  # Character devices
     7.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32	Thu Sep 01 08:11:16 2005 +0000
     7.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32	Thu Sep 01 09:01:15 2005 +0000
     7.3 @@ -15,11 +15,10 @@ CONFIG_XEN_PHYSDEV_ACCESS=y
     7.4  CONFIG_XEN_BLKDEV_BACKEND=y
     7.5  # CONFIG_XEN_BLKDEV_TAP_BE is not set
     7.6  CONFIG_XEN_NETDEV_BACKEND=y
     7.7 -CONFIG_XEN_TPMDEV_BACKEND=y
     7.8 -# CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS is not set
     7.9 +# CONFIG_XEN_TPMDEV_FRONTEND is not set
    7.10 +# CONFIG_XEN_TPMDEV_BACKEND is not set
    7.11  CONFIG_XEN_BLKDEV_FRONTEND=y
    7.12  CONFIG_XEN_NETDEV_FRONTEND=y
    7.13 -CONFIG_XEN_TPMDEV_FRONTEND=y
    7.14  CONFIG_XEN_NETDEV_GRANT_TX=y
    7.15  CONFIG_XEN_NETDEV_GRANT_RX=y
    7.16  # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
    7.17 @@ -1858,9 +1857,7 @@ CONFIG_HANGCHECK_TIMER=m
    7.18  #
    7.19  # TPM devices
    7.20  #
    7.21 -CONFIG_TCG_TPM=m
    7.22 -CONFIG_TCG_NSC=m
    7.23 -CONFIG_TCG_ATMEL=m
    7.24 +# CONFIG_TCG_TPM is not set
    7.25  
    7.26  #
    7.27  # I2C support
     8.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64	Thu Sep 01 08:11:16 2005 +0000
     8.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_64	Thu Sep 01 09:01:15 2005 +0000
     8.3 @@ -15,10 +15,10 @@ CONFIG_XEN_PHYSDEV_ACCESS=y
     8.4  CONFIG_XEN_BLKDEV_BACKEND=y
     8.5  # CONFIG_XEN_BLKDEV_TAP_BE is not set
     8.6  CONFIG_XEN_NETDEV_BACKEND=y
     8.7 -# CONFIG_XEN_TPMEV_BACKEND is not set
     8.8 +# CONFIG_XEN_TPMDEV_FRONTEND is not set
     8.9 +# CONFIG_XEN_TPMDEV_BACKEND is not set
    8.10  CONFIG_XEN_BLKDEV_FRONTEND=y
    8.11  CONFIG_XEN_NETDEV_FRONTEND=y
    8.12 -# CONFIG_XEN_TPMDEV_FRONTEND is not set
    8.13  CONFIG_XEN_NETDEV_GRANT_TX=y
    8.14  CONFIG_XEN_NETDEV_GRANT_RX=y
    8.15  # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
     9.1 --- a/tools/Makefile	Thu Sep 01 08:11:16 2005 +0000
     9.2 +++ b/tools/Makefile	Thu Sep 01 09:01:15 2005 +0000
     9.3 @@ -12,8 +12,10 @@ SUBDIRS += xcutils
     9.4  SUBDIRS += firmware
     9.5  SUBDIRS += security
     9.6  SUBDIRS += console
     9.7 +ifeq ($(VTPM_TOOLS),y)
     9.8  SUBDIRS += vtpm_manager
     9.9  SUBDIRS += vtpm
    9.10 +endif
    9.11  SUBDIRS += xenstat
    9.12  
    9.13  .PHONY: all install clean check check_clean ioemu eioemuinstall ioemuclean