Date: Sun, 7 Sep 2014 17:42:32 +0000 (UTC) From: Jakub Wojciech Klama <jceel@FreeBSD.org> 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 Message-ID: <201409071742.s87HgWuY010730@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409071742.s87HgWuY010730>