From owner-svn-src-projects@FreeBSD.ORG Sun Sep 7 17:42:33 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 78F6F1F6; Sun, 7 Sep 2014 17:42:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4AC8D173E; Sun, 7 Sep 2014 17:42:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s87HgXmD010735; Sun, 7 Sep 2014 17:42:33 GMT (envelope-from jceel@FreeBSD.org) Received: (from jceel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s87HgWuY010730; Sun, 7 Sep 2014 17:42:32 GMT (envelope-from jceel@FreeBSD.org) Message-Id: <201409071742.s87HgWuY010730@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jceel set sender to jceel@FreeBSD.org using -f From: Jakub Wojciech Klama Date: Sun, 7 Sep 2014 17:42:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r271229 - in projects/arm_intrng/sys: arm/broadcom/bcm2835 arm/lpc arm/ti conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2014 17:42:33 -0000 Author: jceel Date: Sun Sep 7 17:42:32 2014 New Revision: 271229 URL: http://svnweb.freebsd.org/changeset/base/271229 Log: Don't add intrng.c twice. Compile arm/arm/intr.c if ARM_INTRNG option is not set. Modified: projects/arm_intrng/sys/arm/broadcom/bcm2835/files.bcm2835 projects/arm_intrng/sys/arm/lpc/files.lpc projects/arm_intrng/sys/arm/ti/files.ti projects/arm_intrng/sys/conf/files.arm Modified: projects/arm_intrng/sys/arm/broadcom/bcm2835/files.bcm2835 ============================================================================== --- projects/arm_intrng/sys/arm/broadcom/bcm2835/files.bcm2835 Sun Sep 7 17:07:19 2014 (r271228) +++ projects/arm_intrng/sys/arm/broadcom/bcm2835/files.bcm2835 Sun Sep 7 17:42:32 2014 (r271229) @@ -21,7 +21,6 @@ arm/arm/cpufunc_asm_arm11.S arm/arm/cpufunc_asm_arm11x6.S standard arm/arm/cpufunc_asm_armv5.S standard arm/arm/cpufunc_asm_armv6.S standard -arm/arm/intrng.c standard kern/kern_clocksource.c standard Modified: projects/arm_intrng/sys/arm/lpc/files.lpc ============================================================================== --- projects/arm_intrng/sys/arm/lpc/files.lpc Sun Sep 7 17:07:19 2014 (r271228) +++ projects/arm_intrng/sys/arm/lpc/files.lpc Sun Sep 7 17:42:32 2014 (r271229) @@ -2,7 +2,6 @@ arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_arm9.S standard arm/arm/cpufunc_asm_armv5.S standard -arm/arm/intrng.c standard arm/lpc/lpc_machdep.c standard arm/lpc/lpc_space.c standard arm/lpc/lpc_pwr.c standard Modified: projects/arm_intrng/sys/arm/ti/files.ti ============================================================================== --- projects/arm_intrng/sys/arm/ti/files.ti Sun Sep 7 17:07:19 2014 (r271228) +++ projects/arm_intrng/sys/arm/ti/files.ti Sun Sep 7 17:42:32 2014 (r271229) @@ -9,7 +9,6 @@ arm/arm/cpufunc_asm_armv5.S standard arm/arm/cpufunc_asm_arm10.S standard arm/arm/cpufunc_asm_arm11.S standard arm/arm/cpufunc_asm_armv7.S standard -arm/arm/intrng.c standard arm/ti/ti_common.c standard arm/ti/ti_cpuid.c standard Modified: projects/arm_intrng/sys/conf/files.arm ============================================================================== --- projects/arm_intrng/sys/conf/files.arm Sun Sep 7 17:07:19 2014 (r271228) +++ projects/arm_intrng/sys/conf/files.arm Sun Sep 7 17:42:32 2014 (r271229) @@ -26,6 +26,7 @@ arm/arm/gdb_machdep.c optional gdb arm/arm/identcpu.c standard arm/arm/in_cksum.c optional inet | inet6 arm/arm/in_cksum_arm.S optional inet | inet6 +arm/arm/intr.c optional !arm_intrng arm/arm/intrng.c optional arm_intrng arm/arm/locore.S standard no-obj arm/arm/machdep.c standard