Date: Mon, 12 Jan 2009 19:23:47 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r187112 - in head/sys: conf crypto/via modules Message-ID: <200901121923.n0CJNlTP074310@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Mon Jan 12 19:23:46 2009 New Revision: 187112 URL: http://svn.freebsd.org/changeset/base/187112 Log: Connect padlock(4) to amd64 build for VIA Nano processors. Modified: head/sys/conf/files.amd64 head/sys/crypto/via/padlock.c head/sys/crypto/via/padlock_hash.c head/sys/modules/Makefile Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Mon Jan 12 19:19:51 2009 (r187111) +++ head/sys/conf/files.amd64 Mon Jan 12 19:23:46 2009 (r187112) @@ -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 Modified: head/sys/crypto/via/padlock.c ============================================================================== --- head/sys/crypto/via/padlock.c Mon Jan 12 19:19:51 2009 (r187111) +++ head/sys/crypto/via/padlock.c Mon Jan 12 19:23:46 2009 (r187112) @@ -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"); Modified: head/sys/crypto/via/padlock_hash.c ============================================================================== --- head/sys/crypto/via/padlock_hash.c Mon Jan 12 19:19:51 2009 (r187111) +++ head/sys/crypto/via/padlock_hash.c Mon Jan 12 19:23:46 2009 (r187112) @@ -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> Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Mon Jan 12 19:19:51 2009 (r187111) +++ head/sys/modules/Makefile Mon Jan 12 19:23:46 2009 (r187112) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901121923.n0CJNlTP074310>