svn commit: r212861 - in head/sys: amd64/conf boot/forth conf i386/conf

[Norikatsu Shigemura]

Author: nork
Date: Sun Sep 19 14:40:37 2010
New Revision: 212861
URL: http://svn.freebsd.org/changeset/base/212861

Log:
  Add support 'device tpm' for amd64.
  Add tpm(4)'s default setting to /boot/defaults/loader.conf.
  Add 'device tpm' to NOTES for amd64 and i386.
  
  Discussed with:	takawata
  Approved by:	imp (mentor)

Modified:
  head/sys/amd64/conf/NOTES
  head/sys/boot/forth/loader.conf
  head/sys/conf/files.amd64
  head/sys/i386/conf/NOTES

Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES	Sun Sep 19 14:21:39 2010	(r212860)
+++ head/sys/amd64/conf/NOTES	Sun Sep 19 14:40:37 2010	(r212861)
@@ -421,6 +421,7 @@ options 	SAFE_RNDTEST	# enable rndtest s
 # vpd: Vital Product Data kernel interface
 # asmc: Apple System Management Controller
 # si: Specialix International SI/XIO or SX intelligent serial card
+# tpm: Trusted Platform Module
 
 # Notes on the Specialix SI/XIO driver:
 #  The host card is memory, not IO mapped.
@@ -436,6 +437,7 @@ device		smbios
 device		vpd
 device		asmc
 #device		si
+device		tpm
 
 #
 # Laptop/Notebook options:

Modified: head/sys/boot/forth/loader.conf
==============================================================================
--- head/sys/boot/forth/loader.conf	Sun Sep 19 14:21:39 2010	(r212860)
+++ head/sys/boot/forth/loader.conf	Sun Sep 19 14:40:37 2010	(r212861)
@@ -473,6 +473,7 @@ vkbd_load="NO"			# Virtual AT keyboard i
 vpd_load="NO"			# Vital Product Data kernel interface
 vpo_load="NO"			# Parallel to SCSI interface driver
 amdtemp_load="NO"		# AMD K8/K10/K11 temperature monitor
+tpm_load="NO"			# Trusted Platform Module
 
 ##############################################################
 ###  ACPI settings  ##########################################

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Sun Sep 19 14:21:39 2010	(r212860)
+++ head/sys/conf/files.amd64	Sun Sep 19 14:40:37 2010	(r212861)
@@ -229,6 +229,9 @@ dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvesactl.c		optional	sc vga vesa
 dev/syscons/scvgarndr.c		optional	sc vga
 dev/syscons/scvtb.c		optional	sc
+dev/tpm/tpm.c			optional	tpm
+dev/tpm/tpm_acpi.c		optional	tpm acpi
+dev/tpm/tpm_isa.c		optional	tpm isa
 dev/uart/uart_cpu_amd64.c	optional	uart
 dev/wpi/if_wpi.c		optional	wpi
 isa/syscons_isa.c		optional	sc

Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES	Sun Sep 19 14:21:39 2010	(r212860)
+++ head/sys/i386/conf/NOTES	Sun Sep 19 14:40:37 2010	(r212861)
@@ -751,6 +751,7 @@ device		glxsb		# AMD Geode LX Security B
 # spic: Sony Programmable I/O controller (VAIO notebooks)
 # asmc: Apple System Management Controller
 # si: Specialix International SI/XIO or SX intelligent serial card driver
+# tpm: Trusted Platform Module
 
 # Notes on APM
 #  The flags takes the following meaning for apm0:
@@ -789,6 +790,7 @@ hint.spic.0.at="isa"
 hint.spic.0.port="0x10a0"
 device		asmc
 #device		si
+device		tpm
 
 #
 # Laptop/Notebook options: