Module Name: src
Committed By: skrll
Date: Sat Nov 8 08:08:32 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: RPI std.rpi
Log Message:
Move some options into std.rpi
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbarm/conf/RPI
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/std.rpi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.58 src/sys/arch/evbarm/conf/RPI:1.59
--- src/sys/arch/evbarm/conf/RPI:1.58 Sun Oct 12 12:01:50 2014
+++ src/sys/arch/evbarm/conf/RPI Sat Nov 8 08:08:32 2014
@@ -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 @@ options RTC_OFFSET=0 # hardware clock i
# CPU options
-options CPU_ARM1176
-options BCM2835
options PMAPCOUNTERS
-options FPU_VFP
# Architecture options
Index: src/sys/arch/evbarm/conf/std.rpi
diff -u src/sys/arch/evbarm/conf/std.rpi:1.15 src/sys/arch/evbarm/conf/std.rpi:1.16
--- src/sys/arch/evbarm/conf/std.rpi:1.15 Sun Aug 24 07:59:22 2014
+++ src/sys/arch/evbarm/conf/std.rpi Sat Nov 8 08:08:32 2014
@@ -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 @@ include "arch/evbarm/conf/files.rpi"
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
