diff options
| author | jkim <jkim@FreeBSD.org> | 2009-01-12 19:23:46 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2009-01-12 19:23:46 +0000 |
| commit | 926a84447a6f932b17a521edb4b5a46e957e9041 (patch) | |
| tree | 9a153d7267a3de4237c81e274f57e72d6b0cf37f | |
| parent | 8ccecdd30b23b16268c234177e702b5d7706216d (diff) | |
| download | FreeBSD-src-926a84447a6f932b17a521edb4b5a46e957e9041.zip FreeBSD-src-926a84447a6f932b17a521edb4b5a46e957e9041.tar.gz | |
Connect padlock(4) to amd64 build for VIA Nano processors.
| -rw-r--r-- | sys/conf/files.amd64 | 3 | ||||
| -rw-r--r-- | sys/crypto/via/padlock.c | 4 | ||||
| -rw-r--r-- | sys/crypto/via/padlock_hash.c | 2 | ||||
| -rw-r--r-- | sys/modules/Makefile | 5 |
4 files changed, 11 insertions, 3 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index c6c403f..b2224dc 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -128,6 +128,9 @@ amd64/pci/pci_bus.c optional pci amd64/pci/pci_cfgreg.c optional pci crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb +crypto/via/padlock.c optional padlock +crypto/via/padlock_cipher.c optional padlock +crypto/via/padlock_hash.c optional padlock dev/acpica/acpi_if.m standard dev/agp/agp_amd64.c optional agp dev/agp/agp_i810.c optional agp diff --git a/sys/crypto/via/padlock.c b/sys/crypto/via/padlock.c index dc97a88..c4d89ad 100644 --- a/sys/crypto/via/padlock.c +++ b/sys/crypto/via/padlock.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/rwlock.h> #include <sys/malloc.h> #include <sys/libkern.h> -#if defined(__i386__) && !defined(PC98) +#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) #include <machine/cpufunc.h> #include <machine/cputypes.h> #include <machine/md_var.h> @@ -85,7 +85,7 @@ padlock_probe(device_t dev) { char capp[256]; -#if defined(__i386__) && !defined(PC98) +#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) /* If there is no AES support, we has nothing to do here. */ if (!(via_feature_xcrypt & VIA_HAS_AES)) { device_printf(dev, "No ACE support.\n"); diff --git a/sys/crypto/via/padlock_hash.c b/sys/crypto/via/padlock_hash.c index 6c42103..ae43197 100644 --- a/sys/crypto/via/padlock_hash.c +++ b/sys/crypto/via/padlock_hash.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/libkern.h> #include <sys/endian.h> -#if defined(__i386__) && !defined(PC98) +#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) #include <machine/cpufunc.h> #include <machine/cputypes.h> #include <machine/md_var.h> diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 97d7cf2..0fb77fa 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -553,6 +553,11 @@ _nxge= nxge .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _opensolaris= opensolaris .endif +.if ${MK_CRYPT} != "no" || defined(ALL_MODULES) +.if exists(${.CURDIR}/../crypto/via) +_padlock= padlock +.endif +.endif _pccard= pccard _rdma= rdma _safe= safe |
