svn commit: r211201 - in head: share/man/man4 sys/conf sys/dev/tpm sys/modules sys/modules/tpm

[Rui Paulo]

On 12 Aug 2010, at 01:16, Takanori Watanabe wrote:

> Author: takawata
> Date: Thu Aug 12 00:16:18 2010
> New Revision: 211201
> URL: http://svn.freebsd.org/changeset/base/211201
> 
> Log:
>  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 at genua.de>
> 
> Added:
>  head/share/man/man4/tpm.4   (contents, props changed)
>  head/sys/dev/tpm/
>  head/sys/dev/tpm/tpm.c   (contents, props changed)
>  head/sys/dev/tpm/tpm_acpi.c   (contents, props changed)
>  head/sys/dev/tpm/tpm_isa.c   (contents, props changed)
>  head/sys/dev/tpm/tpmvar.h   (contents, props changed)
>  head/sys/modules/tpm/
>  head/sys/modules/tpm/Makefile   (contents, props changed)
> Modified:
>  head/sys/conf/files.i386
>  head/sys/modules/Makefile

This breaks pc98:

===> tpm (depend)rm -f .depend
mkdep -f .depend -a   -nostdinc -DPC98 -D_KERNEL -DKLD_MODULE -DHAVE_KERNEL_OPTI
ON_HEADERS -I. -I@ -I@/contrib/altq -I/scratch/tmp/rpaulo/obj/pc98.i386/scratch/tmp/rpaulo/p4/dtrace/sys/GENERIC /scratch/tmp/rpaulo/p4/dtrace/sys/modules/tpm/.
/../dev/tpm/tpm.c /scratch/tmp/rpaulo/p4/dtrace/sys/modules/tpm/../../dev/tpm/t
pm_isa.c /scratch/tmp/rpaulo/p4/dtrace/sys/modules/tpm/../../dev/tpm/tpm_acpi.c
In file included from /scratch/tmp/rpaulo/p4/dtrace/sys/modules/tpm/../../dev/tp
m/tpm.c:42:@/isa/isareg.h:37:2: error: #error isareg.h is included from PC-9801 source
In file included from /scratch/tmp/rpaulo/p4/dtrace/sys/modules/tpm/../../dev/tpm/tpm_isa.c:40:
@/isa/isareg.h:37:2: error: #error isareg.h is included from PC-9801 source
In file included from /scratch/tmp/rpaulo/p4/dtrace/sys/modules/tpm/../../dev/tpm/tpm_acpi.c:38:
@/isa/isareg.h:37:2: error: #error isareg.h is included from PC-9801 sourceIn file included from @/contrib/dev/acpica/include/platform/acenv.h:197,
                 from @/contrib/dev/acpica/include/acpi.h:128,                 from /scratch/tmp/rpaulo/p4/dtrace/sys/modules/tpm/../../dev/tp
m/tpm_acpi.c:43:
@/contrib/dev/acpica/include/platform/acfreebsd.h:124:36: error: machine/acpica_
machdep.h: No such file or directory
In file included from @/contrib/dev/acpica/include/acpi.h:130,
                 from /scratch/tmp/rpaulo/p4/dtrace/sys/modules/tpm/../../dev/tp
m/tpm_acpi.c:43:
@/contrib/dev/acpica/include/actypes.h:127:2: error: #error ACPI_MACHINE_WIDTH n
ot defined
@/contrib/dev/acpica/include/actypes.h:276:2: error: #error unknown ACPI_MACHINE
_WIDTH
mkdep: compile failed

Maybe you want to disable tpm for pc98.

Regards,
--
Rui Paulo