head	1.3;
access;
symbols
	RELENG_8_4:1.3.0.2
	RELENG_9_1_0_RELEASE:1.2.4.1.4.2
	RELENG_9_1:1.2.4.1.0.4
	RELENG_9_1_BP:1.2.4.1
	RELENG_8_3_0_RELEASE:1.2.2.2.4.1
	RELENG_8_3:1.2.2.2.0.4
	RELENG_8_3_BP:1.2.2.2
	RELENG_9_0_0_RELEASE:1.2.4.1.2.1
	RELENG_9_0:1.2.4.1.0.2
	RELENG_9_0_BP:1.2.4.1
	RELENG_9:1.2.0.4
	RELENG_9_BP:1.2
	RELENG_8_2_0_RELEASE:1.2.2.2.2.1
	RELENG_8_2:1.2.2.2.0.2
	RELENG_8_2_BP:1.2.2.2
	RELENG_8:1.2.0.2;
locks; strict;
comment	@# @;


1.3
date	2012.11.17.01.53.01;	author svnexp;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2010.08.13.04.00.35;	author takawata;	state Exp;
branches
	1.2.2.1
	1.2.4.1;
next	1.1;

1.1
date	2010.08.12.00.16.18;	author takawata;	state Exp;
branches;
next	;

1.3.2.1
date	2012.11.17.01.53.01;	author svnexp;	state dead;
branches;
next	1.3.2.2;

1.3.2.2
date	2013.03.28.13.05.24;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2010.11.09.13.39.17;	author nork;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2010.11.09.13.39.17;	author nork;	state Exp;
branches
	1.2.2.2.2.1
	1.2.2.2.4.1;
next	1.2.2.3;

1.2.2.3
date	2012.11.17.10.36.58;	author svnexp;	state Exp;
branches;
next	;

1.2.2.2.2.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.2.2.2.4.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.2.2.4.2;

1.2.2.2.4.2
date	2012.11.17.08.25.34;	author svnexp;	state Exp;
branches;
next	;

1.2.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.2.4.1.2.1
	1.2.4.1.4.1;
next	1.2.4.2;

1.2.4.2
date	2012.11.17.11.37.18;	author svnexp;	state Exp;
branches;
next	;

1.2.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.2.4.1.2.2;

1.2.4.1.2.2
date	2012.11.17.08.37.15;	author svnexp;	state Exp;
branches;
next	;

1.2.4.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.2.4.1.4.2;

1.2.4.1.4.2
date	2012.11.17.08.48.06;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/modules/tpm/Makefile 211270 2010-08-13 04:00:35Z takawata $

.PATH:	${.CURDIR}/../../dev/tpm

KMOD=	tpm

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>
@


1.3.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:24 +0000
@
text
@d1 11
@


1.3.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 11
# $FreeBSD: releng/8.4/sys/modules/tpm/Makefile 215036 2010-11-09 13:39:17Z nork $

.PATH:	${.CURDIR}/../../dev/tpm

KMOD=	tpm

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>
@


1.2
log
@SVN rev 211270 on 2010-08-13 04:00:35Z by takawata

Hook tpm.4 manual to build.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.2.4.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.4.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/tpm/Makefile 211270 2010-08-13 04:00:35Z takawata $
@


1.2.4.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.2.4.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/tpm/Makefile 211270 2010-08-13 04:00:35Z takawata $
@


1.2.4.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.2.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/tpm/Makefile 211270 2010-08-13 04:00:35Z takawata $
@


1.2.2.1
log
@file Makefile was added on branch RELENG_8 on 2010-11-09 13:41:21 +0000
@
text
@d1 11
@


1.2.2.2
log
@SVN rev 215036 on 2010-11-09 13:39:17Z by nork

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_Hoexer@@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)
@
text
@a0 11
# $FreeBSD$

.PATH:	${.CURDIR}/../../dev/tpm

KMOD=	tpm

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>
@


1.2.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/tpm/Makefile 215036 2010-11-09 13:39:17Z nork $
@


1.2.2.2.4.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.2.2.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/tpm/Makefile 215036 2010-11-09 13:39:17Z nork $
@


1.2.2.2.2.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.1
log
@SVN rev 211201 on 2010-08-12 00:16:18Z by takawata

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_Hoexer@@genua.de>
@
text
@d6 4
a9 2
SRCS=	tpm.c tpm_isa.c tpm_acpi.c isa_if.h opt_acpi.h acpi_if.h \
	bus_if.h device_if.h
@

