--- wikisrc/ports/evbarm/raspberry_pi.mdwn	2017/10/31 11:32:36	1.66
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	2018/10/30 01:31:15	1.70
@@ -2,7 +2,7 @@
 
 This page attempts to document and coordinate efforts towards NetBSD/evbarm on [Raspberry Pi](http://www.raspberrypi.org). All board variants are supported.
 
-Initial, limited, Raspberry Pi support was introduced in NetBSD 6.0. NetBSD 7.0 adds complete support for the board, along with introducing support for the quad-core Raspberry Pi 2 board.  Raspberry Pi 3 support was added for NetBSD 8, and backported to NetBSD 7 in July of 2017.
+Initial, limited, Raspberry Pi support was introduced in NetBSD 6.0. NetBSD 7.0 adds complete support for the board, along with introducing support for the quad-core Raspberry Pi 2 board.  Raspberry Pi 3 support was added for NetBSD 8, and backported to NetBSD 7 in July of 2017.  (This page assumes those using NetBSD 7 are using 7.2, or the netbsd-7 branch after mid 2018.)
 
 [[images/raspberrypi.jpg]]
 
@@ -12,9 +12,10 @@ Initial, limited, Raspberry Pi support w
 
 # What works (and what doesn't yet)
 
-## NetBSD 7 before July, 2017
+## NetBSD 7 and NetBSD 8
 
  - RaspberryPi 1, and 2 (including SMP)
+ - Raspberry Pi 3 (excluding WiFi and bluetooth)
  - multi-user boot with root on SD card
  - serial or graphics console (with EDID query / parsing)
  - DMA controller driver and sdhc(4) support
@@ -28,10 +29,6 @@ Initial, limited, Raspberry Pi support w
  - USB Ethernet - usmsc(4)
  - X windows.
 
-## NetBSD 7 after July, 2017 and NetBSD 8
-
- - Raspberry Pi 3 (excluding WiFi and bluetooth)
-
 ## NetBSD current
 
  - Raspberry Pi 3 bluetooth
@@ -41,7 +38,6 @@ Initial, limited, Raspberry Pi support w
 
  - USB (host); isochronous transfers.
  - WiFi
- - Raspberry Pi 3 in 64-bit mode.  (Note that this will be provided by the evbarm64 port, rather than evbarm.)
 
 # CPU types
 
@@ -51,6 +47,8 @@ Note that one can also use code for earl
  - Raspberry Pi 2 uses "earmv7hf".
  - Raspberry Pi 3 uses "earmv7hf".
 
+See also [[NetBSD/aarch64|aarch64]] for running the Pi 2/3 in 64-bit mode.
+
 # Installation
 
 ## SD card structure
@@ -96,7 +94,7 @@ NetBSD provides nightly builds on [nyftp
 Once you have rpi.img.gz (or rpi_inst), put it on a uSD card using gunzip and dd, for example:
 
  - gunzip rpi.img.gz
- - dd if=rpi.i7mg of=/dev/disk1
+ - dd if=rpi.img of=/dev/disk1
 
 ### Serial Console
 
@@ -143,7 +141,7 @@ every few weeks.
           /Users/feyrer/work/NetBSD/cvs/src-current/obj.evbarm-Darwin-XXX/sys/arch/evbarm/compile/RPI2/netbsd
          ...
 
- - Besides the "netbsd" kernel in ELF format, there is also a "netbsd.bin" kernel that is in a format that the Raspberry can boot.
+ - Besides the "netbsd" kernel in ELF format, there is also a "netbsd.img" (for current) or "netbsd.bin" (for 7 and 8) kernel that is in a format that the Raspberry can boot.
  - Depending on your hardware version, copy this either to /boot/kernel.img (First generation Pi, Pi Zero hardware) or to /boot/kernel7.img (Pi 2, Pi 3 hardware)
  - reboot