[src/trunk]: src/sys/arch/evbarm/conf Move some options into std.rpi

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/65def14afa64
branches:  trunk
changeset: 333551:65def14afa64
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Nov 08 08:08:32 2014 +0000

description:
Move some options into std.rpi

diffstat:

 sys/arch/evbarm/conf/RPI     |  5 +----
 sys/arch/evbarm/conf/std.rpi |  5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 9b8e94d0b3cf -r 65def14afa64 sys/arch/evbarm/conf/RPI
--- a/sys/arch/evbarm/conf/RPI  Sat Nov 08 08:01:34 2014 +0000
+++ b/sys/arch/evbarm/conf/RPI  Sat Nov 08 08:08:32 2014 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: RPI,v 1.58 2014/10/12 12:01:50 macallan Exp $
+#      $NetBSD: RPI,v 1.59 2014/11/08 08:08:32 skrll Exp $
 #
 #      RPi -- Raspberry Pi
 #
@@ -17,10 +17,7 @@
 
 # CPU options
 
-options        CPU_ARM1176
-options        BCM2835
 options        PMAPCOUNTERS
-options        FPU_VFP
 
 # Architecture options
 
diff -r 9b8e94d0b3cf -r 65def14afa64 sys/arch/evbarm/conf/std.rpi
--- a/sys/arch/evbarm/conf/std.rpi      Sat Nov 08 08:01:34 2014 +0000
+++ b/sys/arch/evbarm/conf/std.rpi      Sat Nov 08 08:08:32 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: std.rpi,v 1.15 2014/08/24 07:59:22 jnemeth Exp $
+#      $NetBSD: std.rpi,v 1.16 2014/11/08 08:08:32 skrll Exp $
 #
 # standard NetBSD/evbarm for Raspberry Pi options
 
@@ -10,6 +10,9 @@
 
 options        MODULAR
 options        MODULAR_DEFAULT_AUTOLOAD
+options        CPU_ARM1176
+options        BCM2835
+options        FPU_VFP
 options        ARM11_COMPAT_MMU
 options        __HAVE_CPU_COUNTER
 options        __HAVE_FAST_SOFTINTS            # should be in types.h