--- wikisrc/ports/evbarm/allwinner.mdwn	2014/12/07 14:28:37	1.37
+++ wikisrc/ports/evbarm/allwinner.mdwn	2015/03/23 18:46:00	1.48
@@ -5,7 +5,7 @@
 # Supported boards
  - [Banana Pi](http://www.bananapi.org/p/product.html) (BPI)
  - Cubieboard 2 (CUBIEBOARD)
- - Cubieboard 4 (ALLWINNER_A80) *NetBSD-current*
+ - [Cubieboard 4](http://cubieboard.org/model/cb4/) (ALLWINNER_A80) *NetBSD-current*
  - Cubietruck (CUBIETRUCK)
  - [Merrii Hummingbird A31](http://www.merrii.com/en/pla_d.asp?id=172) (HUMMINGBIRD_A31)
 
@@ -36,25 +36,34 @@
    - OTG (A20)
  - SATA (A10/A20)
  - Gigabit Ethernet (GMAC)
- - HDMI (A20/A31)
-   - DDC / EDID mode detection
-   - Audio support
- - Framebuffer (A20/A31)
- - IR receiver (A20/A31)
+ - HDMI
+   - DDC / EDID mode detection (A20/A31)
+   - Audio support (A20/A31)
+ - Framebuffer (A20/A31/A80)
+ - IR receiver (A20/A31/A80)
 
 # TODO
- - SoCs
-   - Cortex-A8: A10
-   - Cortex-A7/A15: A80 SMP
- - OTG (A31)
- - USB device mode
- - Bluetooth / WiFi (Cubietruck, Hummingbird A31)
- - 3G (Hummingbird A31)
- - SD/MMC UHS-I support (needs sdmmc(4) changes)
- - TV input (Hummingbird A31)
- - NAND
- - Fast Ethernet (EMAC)
- - IR transmitter (A20)
+ - A10
+   - Interrupt controller
+   - EMAC
+ - A31
+   - OTG
+   - IR transmitter
+   - 3G module
+   - TV input
+ - A80
+   - MP
+   - big.LITTLE support
+   - USB3 (OTG and XHCI)
+   - IR transmitter
+   - HDMI (DDC and mode setting; currently relies on U-Boot for setup)
+   - Audio codec
+ - All
+   - USB device mode
+   - SD/MMC UHS-I support (needs sdmmc(4) changes)
+   - SDIO (Bluetooth / WiFi)
+   - NAND
+   - VGA (Cubietruck, Hummingbird A31, Cubieboard4)
 
 # Installation
 
@@ -62,14 +71,13 @@
 
 * Start with an ARMv7 image from *evbarm-earmv7hf/binary/gzimg/* such as *beagleboard.img*
 * Download a U-Boot build for your board
-  * A10/A20: Download from the linux-sunxi web site <http://dl.linux-sunxi.org/nightly/u-boot-sunxi/u-boot-sunxi/u-boot-sunxi-latest/>
-  * A31: The standard u-boot-sunxi tree doesn't support A31 yet. Until sun6i support is merged, a build is available at <http://dis.invisible.ca/allwinner/a31/> 
-* Write the *u-boot-sunxi-with-spl.bin* loader to the base image:
+  * Download the correct build from the linux-sunxi web site <http://dl.linux-sunxi.org/nightly/u-boot-sunxi/u-boot-sunxi-mainline/u-boot-sunxi-mainline-latest/>.
+* Write the *u-boot-sunxi-with-spl.bin* loader to the empty space at the start of the base image:
 [[!template  id=programlisting text="""
 # dd if=u-boot-sunxi-with-spl.bin of=beagleboard.img bs=1k seek=8 conv=notrunc
 """]]
 * Write the image to an SD card.
-* Copy the kernel (netbsd.ub) for your board to the root of the MS-DOS partition.
+* Copy the kernel (netbsd.ub) for your board to the root of the MS-DOS partition on the SD card.
 * Create or edit uEnv.txt on the MS-DOS partition:
 [[!template  id=programlisting text="""
 bootargs=root=ld0a
@@ -140,13 +148,9 @@ a31# audiocfg list
 1: [*] audio1 @ awinhdmiaudio0: Allwinner HDMI 1.4, 2 playback channels
 """]]
 
-# Board specific notes
-
-## Merrii Hummingbird A31
-
-There doesn't appear to be a meaningful way to generate a MAC address on these boards. U-Boot from the A31 SDK and from the u-boot-sunxi tree both lack GMAC support, and the Security ID registers (at 0x01c23800) appear to be empty.
+# MAC address
 
-To overcome this, you can specify your own MAC address in *uEnv.txt*:
+On boards where the ethernet MAC address cannot be determmined, a random MAC address will be generated every boot. You can override this behaviour by specifying a MAC address in *uEnv.txt*:
 [[!template  id=programlisting text="""
 bootargs=root=ld0a awge0.mac-address=02:a0:3d:88:1a:1e
 """]]