From owner-svn-src-all@FreeBSD.ORG Mon Jan 12 19:23:47 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B1DB10656E0; Mon, 12 Jan 2009 19:23:47 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5A9BB8FC23; Mon, 12 Jan 2009 19:23:47 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0CJNlpV074314; Mon, 12 Jan 2009 19:23:47 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0CJNlTP074310; Mon, 12 Jan 2009 19:23:47 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <200901121923.n0CJNlTP074310@svn.freebsd.org> From: Jung-uk Kim Date: Mon, 12 Jan 2009 19:23:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187112 - in head/sys: conf crypto/via modules X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jan 2009 19:23:48 -0000 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 #include #include -#if defined(__i386__) && !defined(PC98) +#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) #include #include #include @@ -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 #include #include -#if defined(__i386__) && !defined(PC98) +#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) #include #include #include 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