Author: nork
Date: Tue Nov 9 13:39:17 2010
New Revision: 215036
URL: http://svn.freebsd.org/changeset/base/215036
Log:
MFC 211201
Add tpm(4) driver for Trusted Platform Module.
You may want to look at http://bsssd.sourceforge.net/ .
Submitted by: Hans-Joerg Hoexer <hans-joerg_hoe...@genua.de>
MFC 211204
Fix copyright information.
MFC 211270
Cosmetic change for splitting bus frontend file and core file.
MFC 211271
Hook tpm.4 manual to hook.
MFC 212861
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.
Reviewed by: takawata
Discussed with: takawata
Approved by: imp (mentor)
Added:
stable/8/share/man/man4/tpm.4
- copied, changed from r211201, head/share/man/man4/tpm.4
stable/8/sys/dev/tpm/
- copied from r211201, head/sys/dev/tpm/
stable/8/sys/modules/tpm/
- copied from r211201, head/sys/modules/tpm/
Modified:
stable/8/share/man/man4/Makefile
stable/8/sys/amd64/conf/NOTES
stable/8/sys/boot/forth/loader.conf
stable/8/sys/conf/files.amd64
stable/8/sys/conf/files.i386
stable/8/sys/i386/conf/NOTES
stable/8/sys/modules/Makefile
stable/8/sys/modules/tpm/Makefile
Directory Properties:
stable/8/ (props changed)
stable/8/Makefile (props changed)
stable/8/Makefile.inc1 (props changed)
stable/8/ObsoleteFiles.inc (props changed)
stable/8/UPDATING (props changed)
stable/8/bin/ (props changed)
stable/8/bin/chio/ (props changed)
stable/8/bin/chmod/ (props changed)
stable/8/bin/cp/ (props changed)
stable/8/bin/csh/ (props changed)
stable/8/bin/date/ (props changed)
stable/8/bin/expr/ (props changed)
stable/8/bin/getfacl/ (props changed)
stable/8/bin/kill/ (props changed)
stable/8/bin/ln/ (props changed)
stable/8/bin/ls/ (props changed)
stable/8/bin/mv/ (props changed)
stable/8/bin/pax/ (props changed)
stable/8/bin/pkill/ (props changed)
stable/8/bin/ps/ (props changed)
stable/8/bin/pwait/ (props changed)
stable/8/bin/setfacl/ (props changed)
stable/8/bin/sh/ (props changed)
stable/8/bin/sleep/ (props changed)
stable/8/bin/test/ (props changed)
stable/8/cddl/compat/opensolaris/ (props changed)
stable/8/cddl/contrib/opensolaris/ (props changed)
stable/8/cddl/lib/ (props changed)
stable/8/cddl/lib/libnvpair/ (props changed)
stable/8/cddl/lib/libzpool/ (props changed)
stable/8/cddl/usr.bin/ (props changed)
stable/8/cddl/usr.sbin/ (props changed)
stable/8/contrib/ (props changed)
stable/8/contrib/bind9/ (props changed)
stable/8/contrib/binutils/ (props changed)
stable/8/contrib/bsnmp/ (props changed)
stable/8/contrib/bzip2/ (props changed)
stable/8/contrib/com_err/ (props changed)
stable/8/contrib/csup/ (props changed)
stable/8/contrib/ee/ (props changed)
stable/8/contrib/expat/ (props changed)
stable/8/contrib/file/ (props changed)
stable/8/contrib/gcc/ (props changed)
stable/8/contrib/gdb/ (props changed)
stable/8/contrib/gdtoa/ (props changed)
stable/8/contrib/groff/ (props changed)
stable/8/contrib/ipfilter/ (props changed)
stable/8/contrib/less/ (props changed)
stable/8/contrib/libpcap/ (props changed)
stable/8/contrib/ncurses/ (props changed)
stable/8/contrib/netcat/ (props changed)
stable/8/contrib/ntp/ (props changed)
stable/8/contrib/nvi/ (props changed)
stable/8/contrib/one-true-awk/ (props changed)
stable/8/contrib/openbsm/ (props changed)
stable/8/contrib/openpam/ (props changed)
stable/8/contrib/pf/ (props changed)
stable/8/contrib/sendmail/ (props changed)
stable/8/contrib/tcp_wrappers/ (props changed)
stable/8/contrib/tcpdump/ (props changed)
stable/8/contrib/tcsh/ (props changed)
stable/8/contrib/telnet/ (props changed)
stable/8/contrib/top/ (props changed)
stable/8/contrib/top/install-sh (props changed)
stable/8/contrib/traceroute/ (props changed)
stable/8/contrib/wpa/ (props changed)
stable/8/contrib/xz/ (props changed)
stable/8/crypto/heimdal/ (props changed)
stable/8/crypto/openssh/ (props changed)
stable/8/crypto/openssl/ (props changed)
stable/8/etc/ (props changed)
stable/8/etc/periodic/daily/ (props changed)
stable/8/etc/periodic/daily/800.scrub-zfs (props changed)
stable/8/etc/periodic/security/ (props changed)
stable/8/games/factor/ (props changed)
stable/8/games/fortune/ (props changed)
stable/8/games/grdc/ (props changed)
stable/8/games/pom/ (props changed)
stable/8/gnu/lib/csu/ (props changed)
stable/8/gnu/lib/libstdc++/ (props changed)
stable/8/gnu/usr.bin/ (props changed)
stable/8/gnu/usr.bin/Makefile (props changed)
stable/8/gnu/usr.bin/dialog/ (props changed)
stable/8/gnu/usr.bin/gdb/ (props changed)
stable/8/gnu/usr.bin/gdb/kgdb/ (props changed)
stable/8/gnu/usr.bin/groff/ (props changed)
stable/8/gnu/usr.bin/patch/ (props changed)
stable/8/include/ (props changed)
stable/8/kerberos5/lib/libgssapi_krb5/ (props changed)
stable/8/kerberos5/lib/libgssapi_spnego/ (props changed)
stable/8/kerberos5/usr.bin/kdestroy/ (props changed)
stable/8/kerberos5/usr.bin/kpasswd/ (props changed)
stable/8/lib/ (props changed)
stable/8/lib/bind/ (props changed)
stable/8/lib/csu/ (props changed)
stable/8/lib/libarchive/ (props changed)
stable/8/lib/libbluetooth/ (props changed)
stable/8/lib/libc/ (props changed)
stable/8/lib/libc/locale/ (props changed)
stable/8/lib/libc/stdtime/ (props changed)
stable/8/lib/libc/sys/ (props changed)
stable/8/lib/libc_r/ (props changed)
stable/8/lib/libcam/ (props changed)
stable/8/lib/libcompat/ (props changed)
stable/8/lib/libdevinfo/ (props changed)
stable/8/lib/libdisk/ (props changed)
stable/8/lib/libedit/ (props changed)
stable/8/lib/libelf/ (props changed)
stable/8/lib/libexpat/ (props changed)
stable/8/lib/libfetch/ (props changed)
stable/8/lib/libgeom/ (props changed)
stable/8/lib/libgpib/ (props changed)
stable/8/lib/libgssapi/ (props changed)
stable/8/lib/libjail/ (props changed)
stable/8/lib/libkse/ (props changed)
stable/8/lib/libkvm/ (props changed)
stable/8/lib/liblzma/ (props changed)
stable/8/lib/libmagic/ (props changed)
stable/8/lib/libmemstat/ (props changed)
stable/8/lib/libpam/ (props changed)
stable/8/lib/libpmc/ (props changed)
stable/8/lib/libproc/ (props changed)
stable/8/lib/libradius/ (props changed)
stable/8/lib/librpcsec_gss/ (props changed)
stable/8/lib/librtld_db/ (props changed)
stable/8/lib/libsm/ (props changed)
stable/8/lib/libstand/ (props changed)
stable/8/lib/libtacplus/ (props changed)
stable/8/lib/libthr/ (props changed)
stable/8/lib/libthread_db/ (props changed)
stable/8/lib/libufs/ (props changed)
stable/8/lib/libugidfw/ (props changed)
stable/8/lib/libusb/ (props changed)
stable/8/lib/libusb/usb.h (props changed)
stable/8/lib/libusbhid/ (props changed)
stable/8/lib/libutil/ (props changed)
stable/8/lib/libz/ (props changed)
stable/8/lib/libz/contrib/ (props changed)
stable/8/lib/msun/ (props changed)
stable/8/libexec/ (props changed)
stable/8/libexec/ftpd/ (props changed)
stable/8/libexec/rtld-elf/ (props changed)
stable/8/libexec/tftpd/ (props changed)
stable/8/release/ (props changed)
stable/8/release/doc/en_US.ISO8859-1/hardware/ (props changed)
stable/8/release/picobsd/ (props changed)
stable/8/release/picobsd/floppy.tree/sbin/ (props changed)
stable/8/release/picobsd/floppy.tree/sbin/dhclient-script (props changed)
stable/8/release/picobsd/qemu/ (props changed)
stable/8/release/picobsd/tinyware/login/ (props changed)
stable/8/release/powerpc/ (props changed)
stable/8/sbin/ (props changed)
stable/8/sbin/atacontrol/ (props changed)
stable/8/sbin/bsdlabel/ (props changed)
stable/8/sbin/camcontrol/ (props changed)
stable/8/sbin/ddb/ (props changed)
stable/8/sbin/devd/ (props changed)
stable/8/sbin/devfs/ (props changed)
stable/8/sbin/dhclient/ (props changed)
stable/8/sbin/dump/ (props changed)
stable/8/sbin/dumpfs/ (props changed)
stable/8/sbin/fsck/ (props changed)
stable/8/sbin/fsck_ffs/ (props changed)
stable/8/sbin/fsck_msdosfs/ (props changed)
stable/8/sbin/fsirand/ (props changed)
stable/8/sbin/geom/ (props changed)
stable/8/sbin/geom/class/part/ (props changed)
stable/8/sbin/geom/class/sched/gsched.8 (props changed)
stable/8/sbin/geom/class/stripe/ (props changed)
stable/8/sbin/ggate/ (props changed)
stable/8/sbin/growfs/ (props changed)
stable/8/sbin/hastctl/ (props changed)
stable/8/sbin/hastd/ (props changed)
stable/8/sbin/ifconfig/ (props changed)
stable/8/sbin/ipfw/ (props changed)
stable/8/sbin/iscontrol/ (props changed)
stable/8/sbin/kldload/ (props changed)
stable/8/sbin/kldstat/ (props changed)
stable/8/sbin/mdconfig/ (props changed)
stable/8/sbin/mksnap_ffs/ (props changed)
stable/8/sbin/mount/ (props changed)
stable/8/sbin/mount_cd9660/ (props changed)
stable/8/sbin/mount_msdosfs/ (props changed)
stable/8/sbin/mount_nfs/ (props changed)
stable/8/sbin/natd/ (props changed)
stable/8/sbin/newfs/ (props changed)
stable/8/sbin/newfs_msdos/ (props changed)
stable/8/sbin/ping6/ (props changed)
stable/8/sbin/reboot/ (props changed)
stable/8/sbin/restore/ (props changed)
stable/8/sbin/routed/ (props changed)
stable/8/sbin/setkey/ (props changed)
stable/8/sbin/spppcontrol/ (props changed)
stable/8/sbin/sysctl/ (props changed)
stable/8/sbin/tunefs/ (props changed)
stable/8/sbin/umount/ (props changed)
stable/8/secure/ (props changed)
stable/8/secure/lib/libcrypto/ (props changed)
stable/8/secure/lib/libssl/ (props changed)
stable/8/secure/usr.bin/bdes/ (props changed)
stable/8/secure/usr.bin/openssl/ (props changed)
stable/8/share/dict/ (props changed)
stable/8/share/examples/ (props changed)
stable/8/share/examples/etc/ (props changed)
stable/8/share/examples/kld/syscall/ (props changed)
stable/8/share/man/ (props changed)
stable/8/share/man/man1/ (props changed)
stable/8/share/man/man3/ (props changed)
stable/8/share/man/man4/ (props changed)
stable/8/share/man/man5/ (props changed)
stable/8/share/man/man7/ (props changed)
stable/8/share/man/man8/ (props changed)
stable/8/share/man/man9/ (props changed)
stable/8/share/misc/ (props changed)
stable/8/share/mk/ (props changed)
stable/8/share/termcap/ (props changed)
stable/8/share/timedef/ (props changed)
stable/8/share/zoneinfo/ (props changed)
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/tools/ (props changed)
stable/8/tools/build/mk/ (props changed)
stable/8/tools/build/options/ (props changed)
stable/8/tools/debugscripts/ (props changed)
stable/8/tools/kerneldoc/subsys/ (props changed)
stable/8/tools/regression/acltools/ (props changed)
stable/8/tools/regression/aio/aiotest/ (props changed)
stable/8/tools/regression/bin/sh/ (props changed)
stable/8/tools/regression/fifo/ (props changed)
stable/8/tools/regression/geom/ (props changed)
stable/8/tools/regression/lib/libc/ (props changed)
stable/8/tools/regression/lib/msun/test-conj.t (props changed)
stable/8/tools/regression/mqueue/mqtest1/ (props changed)
stable/8/tools/regression/mqueue/mqtest2/ (props changed)
stable/8/tools/regression/mqueue/mqtest3/ (props changed)
stable/8/tools/regression/mqueue/mqtest4/ (props changed)
stable/8/tools/regression/mqueue/mqtest5/ (props changed)
stable/8/tools/regression/poll/ (props changed)
stable/8/tools/regression/posixsem/ (props changed)
stable/8/tools/regression/priv/ (props changed)
stable/8/tools/regression/usr.bin/ (props changed)
stable/8/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed)
stable/8/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed)
stable/8/tools/regression/usr.bin/pkill/pkill-_g.t (props changed)
stable/8/tools/regression/usr.bin/sed/ (props changed)
stable/8/tools/regression/usr.bin/tr/ (props changed)
stable/8/tools/test/ (props changed)
stable/8/tools/tools/ (props changed)
stable/8/tools/tools/ath/ (props changed)
stable/8/tools/tools/ath/common/dumpregs.h (props changed)
stable/8/tools/tools/ath/common/dumpregs_5210.c (props changed)
stable/8/tools/tools/ath/common/dumpregs_5211.c (props changed)
stable/8/tools/tools/ath/common/dumpregs_5212.c (props changed)
stable/8/tools/tools/ath/common/dumpregs_5416.c (props changed)
stable/8/tools/tools/nanobsd/ (props changed)
stable/8/tools/tools/netrate/ (props changed)
stable/8/tools/tools/netrate/tcpp/ (props changed)
stable/8/tools/tools/termcap/termcap.pl (props changed)
stable/8/tools/tools/umastat/ (props changed)
stable/8/tools/tools/vimage/ (props changed)
stable/8/usr.bin/ (props changed)
stable/8/usr.bin/apply/ (props changed)
stable/8/usr.bin/ar/ (props changed)
stable/8/usr.bin/awk/ (props changed)
stable/8/usr.bin/biff/ (props changed)
stable/8/usr.bin/c89/ (props changed)
stable/8/usr.bin/c99/ (props changed)
stable/8/usr.bin/calendar/ (props changed)
stable/8/usr.bin/catman/ (props changed)
stable/8/usr.bin/column/ (props changed)
stable/8/usr.bin/comm/ (props changed)
stable/8/usr.bin/cpio/ (props changed)
stable/8/usr.bin/csup/ (props changed)
stable/8/usr.bin/du/ (props changed)
stable/8/usr.bin/ee/ (props changed)
stable/8/usr.bin/enigma/ (props changed)
stable/8/usr.bin/fetch/ (props changed)
stable/8/usr.bin/find/ (props changed)
stable/8/usr.bin/finger/ (props changed)
stable/8/usr.bin/fstat/ (props changed)
stable/8/usr.bin/gcore/ (props changed)
stable/8/usr.bin/getopt/ (props changed)
stable/8/usr.bin/gzip/ (props changed)
stable/8/usr.bin/hexdump/ (props changed)
stable/8/usr.bin/indent/ (props changed)
stable/8/usr.bin/jot/ (props changed)
stable/8/usr.bin/kdump/ (props changed)
stable/8/usr.bin/killall/ (props changed)
stable/8/usr.bin/ktrace/ (props changed)
stable/8/usr.bin/lex/ (props changed)
stable/8/usr.bin/locale/ (props changed)
stable/8/usr.bin/lockf/ (props changed)
stable/8/usr.bin/look/ (props changed)
stable/8/usr.bin/mail/ (props changed)
stable/8/usr.bin/make/ (props changed)
stable/8/usr.bin/makewhatis/ (props changed)
stable/8/usr.bin/minigzip/ (props changed)
stable/8/usr.bin/ncal/ (props changed)
stable/8/usr.bin/netstat/ (props changed)
stable/8/usr.bin/pathchk/ (props changed)
stable/8/usr.bin/perror/ (props changed)
stable/8/usr.bin/procstat/ (props changed)
stable/8/usr.bin/rpcgen/ (props changed)
stable/8/usr.bin/ruptime/ (props changed)
stable/8/usr.bin/script/ (props changed)
stable/8/usr.bin/sed/ (props changed)
stable/8/usr.bin/sockstat/ (props changed)
stable/8/usr.bin/split/ (props changed)
stable/8/usr.bin/stat/ (props changed)
stable/8/usr.bin/systat/ (props changed)
stable/8/usr.bin/tar/ (props changed)
stable/8/usr.bin/tftp/ (props changed)
stable/8/usr.bin/touch/ (props changed)
stable/8/usr.bin/tr/ (props changed)
stable/8/usr.bin/truss/ (props changed)
stable/8/usr.bin/uname/ (props changed)
stable/8/usr.bin/unifdef/ (props changed)
stable/8/usr.bin/uniq/ (props changed)
stable/8/usr.bin/unzip/ (props changed)
stable/8/usr.bin/uudecode/ (props changed)
stable/8/usr.bin/vmstat/ (props changed)
stable/8/usr.bin/w/ (props changed)
stable/8/usr.bin/whois/ (props changed)
stable/8/usr.bin/xinstall/ (props changed)
stable/8/usr.bin/xlint/ (props changed)
stable/8/usr.bin/yacc/ (props changed)
stable/8/usr.sbin/ (props changed)
stable/8/usr.sbin/Makefile (props changed)
stable/8/usr.sbin/acpi/ (props changed)
stable/8/usr.sbin/arp/ (props changed)
stable/8/usr.sbin/asf/ (props changed)
stable/8/usr.sbin/bluetooth/ (props changed)
stable/8/usr.sbin/bluetooth/bthidcontrol/ (props changed)
stable/8/usr.sbin/bluetooth/bthidd/ (props changed)
stable/8/usr.sbin/boot0cfg/ (props changed)
stable/8/usr.sbin/bsnmpd/ (props changed)
stable/8/usr.sbin/burncd/ (props changed)
stable/8/usr.sbin/cdcontrol/ (props changed)
stable/8/usr.sbin/chown/ (props changed)
stable/8/usr.sbin/config/ (props changed)
stable/8/usr.sbin/cpucontrol/ (props changed)
stable/8/usr.sbin/crashinfo/ (props changed)
stable/8/usr.sbin/cron/ (props changed)
stable/8/usr.sbin/crunch/examples/ (props changed)
stable/8/usr.sbin/ctm/ (props changed)
stable/8/usr.sbin/cxgbtool/ (props changed)
stable/8/usr.sbin/devinfo/ (props changed)
stable/8/usr.sbin/diskinfo/ (props changed)
stable/8/usr.sbin/dumpcis/cardinfo.h (props changed)
stable/8/usr.sbin/dumpcis/cis.h (props changed)
stable/8/usr.sbin/faithd/ (props changed)
stable/8/usr.sbin/fdcontrol/ (props changed)
stable/8/usr.sbin/fdformat/ (props changed)
stable/8/usr.sbin/fdread/ (props changed)
stable/8/usr.sbin/fdwrite/ (props changed)
stable/8/usr.sbin/fifolog/ (props changed)
stable/8/usr.sbin/flowctl/ (props changed)
stable/8/usr.sbin/freebsd-update/ (props changed)
stable/8/usr.sbin/i2c/ (props changed)
stable/8/usr.sbin/inetd/ (props changed)
stable/8/usr.sbin/iostat/ (props changed)
stable/8/usr.sbin/jail/ (props changed)
stable/8/usr.sbin/jls/ (props changed)
stable/8/usr.sbin/lpr/ (props changed)
stable/8/usr.sbin/mailwrapper/ (props changed)
stable/8/usr.sbin/makefs/ffs/ffs_bswap.c (props changed)
stable/8/usr.sbin/makefs/ffs/ffs_subr.c (props changed)
stable/8/usr.sbin/makefs/ffs/ufs_bswap.h (props changed)
stable/8/usr.sbin/makefs/getid.c (props changed)
stable/8/usr.sbin/mergemaster/ (props changed)
stable/8/usr.sbin/mfiutil/ (props changed)
stable/8/usr.sbin/mountd/ (props changed)
stable/8/usr.sbin/moused/ (props changed)
stable/8/usr.sbin/mptutil/ (props changed)
stable/8/usr.sbin/mtest/ (props changed)
stable/8/usr.sbin/mtree/ (props changed)
stable/8/usr.sbin/named/ (props changed)
stable/8/usr.sbin/ndp/ (props changed)
stable/8/usr.sbin/newsyslog/ (props changed)
stable/8/usr.sbin/nfsdumpstate/ (props changed)
stable/8/usr.sbin/ntp/ (props changed)
stable/8/usr.sbin/pciconf/ (props changed)
stable/8/usr.sbin/periodic/ (props changed)
stable/8/usr.sbin/pmcannotate/ (props changed)
stable/8/usr.sbin/pmccontrol/ (props changed)
stable/8/usr.sbin/pmcstat/ (props changed)
stable/8/usr.sbin/powerd/ (props changed)
stable/8/usr.sbin/ppp/ (props changed)
stable/8/usr.sbin/pppctl/ (props changed)
stable/8/usr.sbin/pstat/ (props changed)
stable/8/usr.sbin/rpc.lockd/ (props changed)
stable/8/usr.sbin/rpc.umntall/ (props changed)
stable/8/usr.sbin/rtadvd/ (props changed)
stable/8/usr.sbin/rtsold/ (props changed)
stable/8/usr.sbin/sade/ (props changed)
stable/8/usr.sbin/service/ (props changed)
stable/8/usr.sbin/services_mkdb/ (props changed)
stable/8/usr.sbin/setfmac/ (props changed)
stable/8/usr.sbin/setpmac/ (props changed)
stable/8/usr.sbin/smbmsg/ (props changed)
stable/8/usr.sbin/sysinstall/ (props changed)
stable/8/usr.sbin/syslogd/ (props changed)
stable/8/usr.sbin/traceroute/ (props changed)
stable/8/usr.sbin/traceroute6/ (props changed)
stable/8/usr.sbin/uathload/ (props changed)
stable/8/usr.sbin/ugidfw/ (props changed)
stable/8/usr.sbin/uhsoctl/ (props changed)
stable/8/usr.sbin/usbconfig/ (props changed)
stable/8/usr.sbin/vidcontrol/ (props changed)
stable/8/usr.sbin/watchdogd/ (props changed)
stable/8/usr.sbin/wpa/ (props changed)
stable/8/usr.sbin/ypserv/ (props changed)
stable/8/usr.sbin/zic/ (props changed)
Modified: stable/8/share/man/man4/Makefile
==============================================================================
--- stable/8/share/man/man4/Makefile Tue Nov 9 12:00:39 2010
(r215035)
+++ stable/8/share/man/man4/Makefile Tue Nov 9 13:39:17 2010
(r215036)
@@ -414,6 +414,7 @@ MAN= aac.4 \
ti.4 \
tl.4 \
tnt4882.4 \
+ ${_tpm.4} \
trm.4 \
tty.4 \
tun.4 \
@@ -664,6 +665,7 @@ _padlock.4= padlock.4
_rr232x.4= rr232x.4
_speaker.4= speaker.4
_spkr.4= spkr.4
+_tpm.4= tpm.4
_urtw.4= urtw.4
_wpi.4= wpi.4
Copied and modified: stable/8/share/man/man4/tpm.4 (from r211201,
head/share/man/man4/tpm.4)
==============================================================================
--- head/share/man/man4/tpm.4 Thu Aug 12 00:16:18 2010 (r211201, copy
source)
+++ stable/8/share/man/man4/tpm.4 Tue Nov 9 13:39:17 2010
(r215036)
@@ -1,5 +1,5 @@
.\"
-.\" Copyright (c) 2010 Hans-J
+.\" Copyright (c) 2010 Hans-Joerg Hoexer
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
Modified: stable/8/sys/amd64/conf/NOTES
==============================================================================
--- stable/8/sys/amd64/conf/NOTES Tue Nov 9 12:00:39 2010
(r215035)
+++ stable/8/sys/amd64/conf/NOTES Tue Nov 9 13:39:17 2010
(r215036)
@@ -424,6 +424,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.
@@ -439,6 +440,7 @@ device smbios
device vpd
device asmc
#device si
+device tpm
#
# Laptop/Notebook options:
Modified: stable/8/sys/boot/forth/loader.conf
==============================================================================
--- stable/8/sys/boot/forth/loader.conf Tue Nov 9 12:00:39 2010
(r215035)
+++ stable/8/sys/boot/forth/loader.conf Tue Nov 9 13:39:17 2010
(r215036)
@@ -472,6 +472,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: stable/8/sys/conf/files.amd64
==============================================================================
--- stable/8/sys/conf/files.amd64 Tue Nov 9 12:00:39 2010
(r215035)
+++ stable/8/sys/conf/files.amd64 Tue Nov 9 13:39:17 2010
(r215036)
@@ -230,6 +230,9 @@ dev/syscons/scvesactl.c optional sc vga
dev/syscons/scvgarndr.c optional sc vga
dev/syscons/scvtb.c optional sc
dev/syscons/teken/teken.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: stable/8/sys/conf/files.i386
==============================================================================
--- stable/8/sys/conf/files.i386 Tue Nov 9 12:00:39 2010
(r215035)
+++ stable/8/sys/conf/files.i386 Tue Nov 9 13:39:17 2010
(r215036)
@@ -228,6 +228,9 @@ dev/syscons/scvesactl.c optional sc vga
dev/syscons/scvgarndr.c optional sc vga
dev/syscons/scvtb.c optional sc
dev/syscons/teken/teken.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_i386.c optional uart
dev/acpica/acpi_if.m standard
dev/acpi_support/acpi_wmi_if.m standard
Modified: stable/8/sys/i386/conf/NOTES
==============================================================================
--- stable/8/sys/i386/conf/NOTES Tue Nov 9 12:00:39 2010
(r215035)
+++ stable/8/sys/i386/conf/NOTES Tue Nov 9 13:39:17 2010
(r215036)
@@ -770,6 +770,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:
@@ -808,6 +809,7 @@ hint.spic.0.at="isa"
hint.spic.0.port="0x10a0"
device asmc
#device si
+device tpm
#
# Laptop/Notebook options:
Modified: stable/8/sys/modules/Makefile
==============================================================================
--- stable/8/sys/modules/Makefile Tue Nov 9 12:00:39 2010
(r215035)
+++ stable/8/sys/modules/Makefile Tue Nov 9 13:39:17 2010
(r215036)
@@ -281,6 +281,7 @@ SUBDIR= ${_3dfx} \
ti \
tl \
${_tmpfs} \
+ tpm \
trm \
${_twa} \
twe \
Modified: stable/8/sys/modules/tpm/Makefile
==============================================================================
--- head/sys/modules/tpm/Makefile Thu Aug 12 00:16:18 2010
(r211201)
+++ stable/8/sys/modules/tpm/Makefile Tue Nov 9 13:39:17 2010
(r215036)
@@ -3,7 +3,9 @@
.PATH: ${.CURDIR}/../../dev/tpm
KMOD= tpm
-SRCS= tpm.c tpm_isa.c tpm_acpi.c isa_if.h opt_acpi.h acpi_if.h \
- bus_if.h device_if.h
+
+SRCS= tpm.c bus_if.h device_if.h
+#Bus specific stuff.
+SRCS+= tpm_isa.c tpm_acpi.c isa_if.h opt_acpi.h acpi_if.h
.include <bsd.kmod.mk>
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
