[src/netbsd-7]: src/sys/arch/evbarm/conf Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/3575f83d3034
branches:  netbsd-7
changeset: 798581:3575f83d3034
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Nov 14 15:51:20 2014 +0000

description:
Pull up following revision(s) (requested by jakllsch in ticket #235):
        sys/arch/evbarm/conf/RPI: revision 1.55
enable NFS root FS support in RPI

diffstat:

 sys/arch/evbarm/conf/RPI |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r aaee73f9d5ab -r 3575f83d3034 sys/arch/evbarm/conf/RPI
--- a/sys/arch/evbarm/conf/RPI  Fri Nov 14 15:49:16 2014 +0000
+++ b/sys/arch/evbarm/conf/RPI  Fri Nov 14 15:51:20 2014 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: RPI,v 1.46.2.3 2014/10/03 18:53:56 martin Exp $
+#      $NetBSD: RPI,v 1.46.2.4 2014/11/14 15:51:20 martin Exp $
 #
 #      RPi -- Raspberry Pi
 #
@@ -70,8 +70,8 @@
 #options       PPP_FILTER      # Active filter support for PPP (requires bpf)
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
-#options       NFS_BOOT_BOOTP
-#options       NFS_BOOT_DHCP
+options        NFS_BOOT_BOOTP
+options        NFS_BOOT_DHCP
 #options               NFS_BOOT_BOOTSTATIC
 #options               NFS_BOOTSTATIC_MYIP="\"192.168.1.4\""
 #options               NFS_BOOTSTATIC_GWIP="\"192.168.1.1\""
@@ -259,7 +259,7 @@
 
 # PIFace or other boards using that chip (needs gpio)
 #mcp23s17gpio0 at spi? slave 0 flags 0
-#mcp23s17gpio1 at spi? slave 0 flags 1 
+#mcp23s17gpio1 at spi? slave 0 flags 1
 #mcp23s17gpio2 at spi? slave 0 flags 2
 #mcp23s17gpio3 at spi? slave 0 flags 3