Revert it back. Too many changes for one commit.

Approved by: adrian (mentor)

2 files changed, 120 insertions, 124 deletions

diff --git a/sys/mips/conf/RT305X b/sys/mips/conf/RT305X
index 918eb1d..00506e3 100644
--- a/sys/mips/conf/RT305X
+++ b/sys/mips/conf/RT305X
@@ -24,34 +24,42 @@ makeoptions	MIPS_LITTLE_ENDIAN=defined
 makeoptions	KERNLOADADDR=0x80001000
 
 # Don't build any modules yet.
-makeoptions	MODULES_OVERRIDE="if_bridge bridgestp md ipfw dummynet libalias geom/geom_label zlib"
+makeoptions	MODULES_OVERRIDE="wlan_xauth wlan_wep wlan_tkip wlan_acl wlan_amrr wlan_ccmp wlan_rssadapt random if_bridge bridgestp msdosfs md ipfw dummynet libalias geom/geom_label ufs usb/uplcom usb/u3g usb/umodem usb/umass usb/ucom cam zlib"
 makeoptions	RT3052F
 
 include		"../rt305x/std.rt305x"
 
 hints		"RT305X.hints"		#Default places to look for devices.
 
-# Debugging for use in -current
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-#options	DEADLKRES		#Enable the deadlock resolver
-#options	INVARIANTS		#Enable calls of extra sanity checking
-#options	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
-#options	WITNESS			#Enable checks to detect deadlocks and cycles
-#options	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
-#options	DIAGNOSTIC
-#options	DEBUG_LOCKS
-#options	DEBUG_VFS_LOCKS
+
+# Debugging for use in -current
+#options 	DEADLKRES		#Enable the deadlock resolver
+#options		INVARIANTS		#Enable calls of extra sanity checking
+#options		INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+#options		WITNESS			#Enable checks to detect deadlocks and cycles
+#options		WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
+#options         DIAGNOSTIC
+#options     DEBUG_LOCKS
+#options     DEBUG_VFS_LOCKS
 #options 	GDB
-options		DDB
+options 	DDB
 options 	KDB
 
 options 	SCHED_ULE
 #options 	SCHED_4BSD		#4BSD scheduler
 #options		COMPAT_43
 options 	INET			#InterNETworking
+options 	NFSCL			#Network Filesystem Client
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	PSEUDOFS		#Pseudo-filesystem framework
 #options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 
+options 	BOOTP
+#options 	BOOTP_NFSROOT
+options 	BOOTP_NFSV3
+options 	BOOTP_WIRED_TO=rt0
+options 	BOOTP_COMPAT
 options 	CD9660			# ISO 9660 Filesystem
 options		ROOTDEVNAME=\"cd9660:/dev/map/rootfs.uncompress\"
 options 	TMPFS			# TMP Memory Filesystem
@@ -60,15 +68,6 @@ options 	TMPFS			# TMP Memory Filesystem
 #options 	SOFTUPDATES		#Enable FFS soft updates support
 #options 	UFS_ACL			#Support for access control lists
 #options 	UFS_DIRHASH		#Improve performance on big directories
-
-# BOOTP/NFS boot
-#options 	BOOTP
-#options 	BOOTP_NFSROOT
-#options 	BOOTP_NFSV3
-#options 	BOOTP_WIRED_TO=rt0
-#options 	BOOTP_COMPAT
-#options 	NFSCL			#Network Filesystem Client
-#options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 #options 	ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\"
 
 # Options for making kernel less hangry
@@ -90,46 +89,35 @@ options		NO_SWAPPING
 options 	ZERO_COPY_SOCKETS
 options         MROUTING                # Multicast routing
 options		IPFIREWALL_DEFAULT_TO_ACCEPT
-options 	SCSI_DELAY=1000		# Delay (in ms) before probing SCSI
-
-device		rt
-device		ether
-# RT3050F, RT3052F have only attached switch, so no need to mii/miibus
 
+device		random
+device		loop
+# RT3050F, RT3052F have only pseudo PHYs
+#device		mii
+#device		miibus
 device 		pty			# Pseudo-ttys (telnet etc)
+device		ether
 device 		bpf			# Berkeley packet filter
 device		vlan
 #device		lagg
 #device          if_bridge
-device 		tun			# Packet tunnel.
-device		random
-device		loop
-
-# Chip have two UARTs - UART and UART Light
 device		uart
 nodevice	uart_ns8250
+device 		tun			# Packet tunnel.
+
+device		wlan
 
-# Wireless support
-# Work in progress
-#device		ral
-#device		wlan
 
-# GPIO support
 device		gpio
 device		gpioled
 
-# CFI flash support
 device		cfi			# Detect Flash memmory
 device		cfid
 
-# Read U-Boot environment from flash
 device		nvram2env
 
-# USB support 
-# Partial support. Not included yet.
+device		usb
 #device		dotg			# DWC like USB OTG Controller driver
-#options	USB_DEBUG
-#device		usb
 #device		u3g
 #device		umodem
 #device		uplcom
@@ -137,4 +125,10 @@ device		nvram2env
 #device		da
 #device		pass
 #device		scbus
+options 	SCSI_DELAY=1000		# Delay (in ms) before probing SCSI
+
+#options		USB_EHCI_BIG_ENDIAN_DESC        # handle big-endian byte order
+#options		USB_DEBUG
+#options		USB_REQ_DEBUG
+
 
diff --git a/sys/mips/conf/RT305X.hints b/sys/mips/conf/RT305X.hints
index d76699f..3c8b6cb 100644
--- a/sys/mips/conf/RT305X.hints
+++ b/sys/mips/conf/RT305X.hints
@@ -4,90 +4,87 @@ hint.obio.0.at="nexus0"
 hint.obio.0.maddr=0x10000000
 hint.obio.0.msize=0x10000000
 
-# on-board Ralink Frame Engine
-hint.rt.0.at="nexus0"
-hint.rt.0.maddr=0x10100000
-hint.rt.0.msize=0x10000
-hint.rt.0.irq=3
-
-# UART Light
-hint.uart.1.flags="0x30"
-
-# Lines below is Board specific
-# D-Link DIR-620
+hint.nvram.0.sig=0xe5e60a74
 hint.nvram.0.base=0x1f030000
 hint.nvram.0.maxsize=0x2000
-hint.nvram.0.flags=9 # 1 = No check, 2 = Format U-Boot
+hint.nvram.0.flags=3 # 1 = No check, 2 = Format Generic
+hint.nvram.1.sig=0x5a045e94
 hint.nvram.1.base=0x1f032000
 hint.nvram.1.maxsize=0x4000
-hint.nvram.1.flags=9 # 1 = No check, 2 = Format U-Boot
-
-# Configure SYSCTL_GPIOMODE to pass FUART pins to GPIO
-# original:
-# hint.rt305x_sysctl.0.gpiomode=0x000283
-# required:
-hint.rt305x_sysctl.0.gpiomode=0x00029f
+hint.nvram.1.flags=3 # 1 = No check, 2 = Format Generic
 
-# gpio
+# on-board Ralink Frame Engine
+#hint.rt.0.at="nexus0"
+#hint.rt.0.maddr=0x12000000
+#hint.rt.0.msize=0x200000
+#hint.rt.0.irq=9
+hint.rt.0.macaddr="00:18:e7:d5:83:90"
+
+# on-board Ralink 2872 802.11n core
+hint.rt2860.0.at="nexus0"
+hint.rt2860.0.maddr=0x10180000
+hint.rt2860.0.msize=0x40000
+hint.rt2860.0.irq=4
+
+# uart0
+#hint.uart.0.at="obio0"
+#hint.uart.0.maddr=0x10000C00
+#hint.uart.0.msize=0x100
+#hint.uart.0.irq=12
+#hint.uart.0.flags="0x30"
+
+# uart1
+#hint.uart.1.at="obio0"
+#hint.uart.1.maddr=0x10000500
+#hint.uart.1.msize=0x100
+#hint.uart.1.irq=5
+#hint.uart.1.flags="0x30"
 
-# Buttons
-# GPIO10 - Reset BTN	IN PU II INT
-hint.gpioreset.0.at="gpiobus0"
-hint.gpioreset.0.pins="0x0400"
-hint.gpioreset.0.name="reset"
-hint.gpioreset.0.flags="0x04a1" # (INPUT|PULLUP|INVIN|REPORT)
 
-## GPIO0  - WPS BTN	IN PU II INT
+# gpio
+# GPIO0  - WPS BTN	IN II IO
 hint.gpiobutton.0.at="gpiobus0"
 hint.gpiobutton.0.pins="0x01"
 hint.gpiobutton.0.name="wps"
-hint.gpiobutton.0.flags="0x04a1" # (INPUT|PULLUP|INVIN|REPORT)
-
-# LEDs
-# Power Yellow	8
-# Power Green	9
-# WAN Green	12
-# WAN Yellow	14
-# WPS Orange	11
-# WPS Blue	13
-#GPIO8  STATUS ?
-hint.gpioled.0.at="gpiobus0"
-hint.gpioled.0.pins="0x0100"
-hint.gpioled.0.name="status_yellow"
-hint.gpioled.0.flags="0x0102" # (OUTPUT|INVOUT)
+hint.gpiobutton.0.flags="0x0581"
 
-#GPIO9  STATUS
+# GPIO7  - MODE SW AP	IN II IO
+hint.gpiobutton.1.at="gpiobus0"
+hint.gpiobutton.1.pins="0x80"
+hint.gpiobutton.1.name="mode_ap"
+hint.gpiobutton.1.flags="0x0581"
+
+# GPIO8  - ST LEDRED	OUT	/* 2pin BiDir RED/BLUE LED */
+# GPIO9  - ST LEDBLUE	OUT
+hint.gpioled.0.at="gpiobus0"
+hint.gpioled.0.pins="0x100"
+hint.gpioled.0.name="status_red"
+hint.gpioled.0.flags="0x0002"
 hint.gpioled.1.at="gpiobus0"
-hint.gpioled.1.pins="0x0200"
+hint.gpioled.1.pins="0x200"
+#hint.gpioled.1.name="status_blue"
 hint.gpioled.1.name="status"
-hint.gpioled.1.flags="0x0102" # (OUTPUT|INVOUT)
+hint.gpioled.1.flags="0x0002"
+
+# GPIO10 - RST BTN	IN II IO
+hint.gpiobutton.2.at="gpiobus0"
+hint.gpiobutton.2.pins="0x400"
+hint.gpiobutton.2.name="reset"
+hint.gpiobutton.2.flags="0x0581"
+
+# GPIO11 - MODE SW CL	IN II IO
+hint.gpiobutton.3.at="gpiobus0"
+hint.gpiobutton.3.pins="0x800"
+hint.gpiobutton.3.name="mode_wlan_client"
+hint.gpiobutton.3.flags="0x0581"
 
-#GPIO11 WPS Orange
+# GPIO14 - WPS LED	OUT II IO
 hint.gpioled.2.at="gpiobus0"
-hint.gpioled.2.pins="0x0800"
-hint.gpioled.2.name="wps_orange"
-hint.gpioled.2.flags="0x0002" # (OUTPUT|INVOUT)
-
-#GPIO12 WAN Green
-hint.gpioled.3.at="gpiobus0"
-hint.gpioled.3.pins="0x1000"
-hint.gpioled.3.name="wan"
-hint.gpioled.3.flags="0x0102" # (OUTPUT|INVOUT)
-
-#GPIO13 WPS Blue
-hint.gpioled.4.at="gpiobus0"
-hint.gpioled.4.pins="0x2000"
-hint.gpioled.4.name="wps"
-hint.gpioled.4.flags="0x0002" # (OUTPUT|INVOUT)
-
-#GPIO14 WAN Yellow
-hint.gpioled.5.at="gpiobus0"
-hint.gpioled.5.pins="0x4000"
-hint.gpioled.5.name="wan_yellow"
-hint.gpioled.5.flags="0x0102" # (OUTPUT|INVOUT)
-
-hint.cfi.0.width=2
-hint.cfi.0.shift=2
+hint.gpioled.2.pins="0x4000"
+hint.gpioled.2.name="wps"
+hint.gpioled.2.flags="0x0182"
+
+
 
 #0x00000000-0x00030000 : "Bootloader"
 #0x00030000-0x00040000 : "Factory"
@@ -105,30 +102,35 @@ hint.map.0.readonly=1
 hint.map.1.at="cfid0"
 hint.map.1.start=0x00030000
 hint.map.1.end=0x00040000
-hint.map.1.name="linuxconfig"
+hint.map.1.name="factory"
 
 hint.map.2.at="cfid0"
 hint.map.2.start=0x00040000
-hint.map.2.end=0x00050000
-hint.map.2.name="factory"
+hint.map.2.end=0x00800000
+hint.map.2.name="upgrade"
 
 hint.map.3.at="cfid0"
-hint.map.3.start=0x00050000
-hint.map.3.end=0x007e0000
-hint.map.3.name="upgrade"
+hint.map.3.start=0x00040000
+hint.map.3.end=0x00050000
+hint.map.3.name="config"
 
 hint.map.4.at="cfid0"
-hint.map.4.name="kernel"
-hint.map.4.start=0x00050000
-hint.map.4.end="search:0x00100000:0x10000:.!/bin/sh"
+hint.map.4.start=0x00000000
+hint.map.4.end=0x00000000
+hint.map.4.name="language"
 
 hint.map.5.at="cfid0"
-hint.map.5.name="rootfs"
-hint.map.5.start="search:0x00100000:0x10000:.!/bin/sh"
-hint.map.5.end=0x007e0000
+hint.map.5.start=0x00050000
+hint.map.5.end=0x00150000
+hint.map.5.name="kernel"
 
 hint.map.6.at="cfid0"
-hint.map.6.start=0x007e0000
+hint.map.6.start=0x00150000
 hint.map.6.end=0x00800000
-hint.map.6.name="config"
+hint.map.6.name="rootfs"
+
+
+hint.rt.0.phymask=0x1f
+hint.rt.0.media=100
+hint.rt.0.fduplex=1