Index: ROUTERSTATION
===================================================================
--- ROUTERSTATION	(revision 0)
+++ ROUTERSTATION	(revision 0)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+#
+# Config file for RouterStation (not the Pro) board from Ubiquity.
+#
+
+include "std.ar71xx"
+hints	"ROUTERSTATION.hints"
+
+# Boot off NFS-root
+options		BOOTP
+options		BOOTP_NFSROOT
+options		BOOTP_NFSV3
+options		BOOTP_WIRED_TO=arge0 
+options		BOOTP_COMPAT
+options		ROOTDEVNAME=\"nfs:192.168.10.1:/mnt/bsd\"
Index: std.ar71xx
===================================================================
--- std.ar71xx	(revision 205141)
+++ std.ar71xx	(working copy)
@@ -12,7 +12,7 @@
 options		HZ=1000
 
 files		"../atheros/files.ar71xx"
-hints		"AR71XX.hints"
+hints		"ar71xx.std.hints"
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	MODULES_OVERRIDE=""
@@ -39,14 +39,6 @@
 options         UFS_ACL                 #Support for access control lists
 options         UFS_DIRHASH             #Improve performance on big directories
 
-
-options		BOOTP
-options		BOOTP_NFSROOT
-options		BOOTP_NFSV3
-options		BOOTP_WIRED_TO=arge0 
-options		BOOTP_COMPAT
-options		ROOTDEVNAME=\"nfs:192.168.10.1:/mnt/bsd\"
-
 device		pci
 
 # Wireless NIC cards
@@ -72,11 +64,14 @@
 # options		USB_DEBUG
 device		ohci
 device		ehci
+device          umass           # Disks/Mass storage - Requires scbus and da
+device          da
+device          scbus
 
 device		spibus
 device		ar71xx_spi
 device		mx25l
-# device		geom_redboot
+device		geom_redboot
 
 device		ar71xx_wdog
 
Index: RSPRO.hints
===================================================================
--- RSPRO.hints	(revision 0)
+++ RSPRO.hints	(revision 0)
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+# Ubiquiti ROUTER-STATION Pro board hints file.  All the stuff that's
+# on-board should go here (as opposed to the SoC devices, which should
+# be in ar71xx.std.hints).
+
+# PHY4 = 1 << 4
+hint.arge.0.phymask=0x10
+
+# PHY1, PHY2, PHY3 
+hint.arge.1.phymask=0x0e
+hint.arge.1.media=1000
+hint.arge.1.fduplex=1
+
+hint.mx25l.0.at="spibus0"
+hint.mx25l.0.cs=0
+
+# shares the same bus with mx25l. 
+# CE low for flash, CE high for RTC
+# at the moment it's just stub until SPI bus is ready for such hacks
+# hint.rtc.0.at="spibus0"
+# hint.rtc.0.cs=0
Index: RSPRO
===================================================================
--- RSPRO	(revision 0)
+++ RSPRO	(revision 0)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+#
+# Config file for RouterStation (not the Pro) board from Ubiquity.
+#
+
+include "std.ar71xx"
+hints	"RSPRO.hints"
+
+# Boot off NFS-root
+options		BOOTP
+options		BOOTP_NFSROOT
+options		BOOTP_NFSV3
+options		BOOTP_WIRED_TO=arge0 
+options		BOOTP_COMPAT
+options		ROOTDEVNAME=\"nfs:192.168.10.1:/mnt/bsd\"
Index: ROUTERSTATION.hints
===================================================================
--- ROUTERSTATION.hints	(revision 205141)
+++ ROUTERSTATION.hints	(working copy)
@@ -1,57 +1,18 @@
 # $FreeBSD$
-hint.apb.0.at="nexus0"
-hint.apb.0.irq=4
 
-# uart0
-hint.uart.0.at="apb0"
-# see atheros/uart_cpu_ar71xx.c why +3
-hint.uart.0.maddr=0x18020003
-hint.uart.0.msize=0x18
-hint.uart.0.irq=3
+# Ubiquiti ROUTER-STATION board hints file.  All the stuff that's
+# on-board should go here (as opposed to the SoC devices, which should
+# be in ar71xx.std.hints).
 
-#ohci
-hint.ohci.0.at="apb0"
-hint.ohci.0.maddr=0x1c000000
-hint.ohci.0.msize=0x01000000
-hint.ohci.0.irq=6
-
-#ehci
-hint.ehci.0.at="nexus0"
-hint.ehci.0.maddr=0x1b000000
-hint.ehci.0.msize=0x01000000
-hint.ehci.0.irq=1
-
-# pci
-hint.pcib.0.at="nexus0"
-hint.pcib.0.irq=0
-
-hint.arge.0.at="nexus0"
-hint.arge.0.maddr=0x19000000
-hint.arge.0.msize=0x1000
-hint.arge.0.irq=2
-# PHY4 = 1 << 4
-hint.arge.0.phymask=0x10
-# Uncomment this hint for RS (not PRO)
+# ROUTER-STATION has arge at phy 20.
 # PHY20 = 1 << 20
-# hint.arge.0.phymask=0x100000
+hint.arge.0.phymask=0x100000
 
-hint.arge.1.at="nexus0"
-hint.arge.1.maddr=0x1a000000
-hint.arge.1.msize=0x1000
-hint.arge.1.irq=3
-# PHY1, PHY2, PHY3 
-hint.arge.1.phymask=0x0e
-# should be 100 for RS 
-hint.arge.1.media=1000
+# arge1 has a switch that's 100BaseTX based.
+hint.arge.1.media=100
 hint.arge.1.fduplex=1
-# Uncomment this hint for RS (not PRO)
-# hint.arge.0.phymask=70000
+hint.arge.0.phymask=0x70000
 
-# SPI flash
-hint.spi.0.at="nexus0"
-hint.spi.0.maddr=0x1f000000
-hint.spi.0.msize=0x10
-
 hint.mx25l.0.at="spibus0"
 hint.mx25l.0.cs=0
 
@@ -60,6 +21,3 @@
 # at the moment it's just stub until SPI bus is ready for such hacks
 # hint.rtc.0.at="spibus0"
 # hint.rtc.0.cs=0
-
-# Watchdog
-hint.ar71xx_wdog.0.at="nexus0"
Index: ar71xx.std.hints
===================================================================
--- ar71xx.std.hints	(revision 205141)
+++ ar71xx.std.hints	(working copy)
@@ -29,37 +29,16 @@
 hint.arge.0.maddr=0x19000000
 hint.arge.0.msize=0x1000
 hint.arge.0.irq=2
-# PHY4 = 1 << 4
-hint.arge.0.phymask=0x10
-# Uncomment this hint for RS (not PRO)
-# PHY20 = 1 << 20
-# hint.arge.0.phymask=0x100000
 
 hint.arge.1.at="nexus0"
 hint.arge.1.maddr=0x1a000000
 hint.arge.1.msize=0x1000
 hint.arge.1.irq=3
-# PHY1, PHY2, PHY3 
-hint.arge.1.phymask=0x0e
-# should be 100 for RS 
-hint.arge.1.media=1000
-hint.arge.1.fduplex=1
-# Uncomment this hint for RS (not PRO)
-# hint.arge.0.phymask=70000
 
 # SPI flash
 hint.spi.0.at="nexus0"
 hint.spi.0.maddr=0x1f000000
 hint.spi.0.msize=0x10
 
-hint.mx25l.0.at="spibus0"
-hint.mx25l.0.cs=0
-
-# shares the same bus with mx25l. 
-# CE low for flash, CE high for RTC
-# at the moment it's just stub until SPI bus is ready for such hacks
-# hint.rtc.0.at="spibus0"
-# hint.rtc.0.cs=0
-
 # Watchdog
 hint.ar71xx_wdog.0.at="nexus0"