Set correct argemdio addr, comment out arge1 as its not physically

connected to anything.  Move a couple of devices out of the kernel
and into modules.

diff --git a/sys/mips/conf/WZR-300HP b/sys/mips/conf/WZR-300HP
index 8f84776a7f63692e9c50d6a2bfa23772bd7d9654..c8280cc7d89a65c7f46cb91511739f0ec5929645 100644 (file)
--- a/sys/mips/conf/WZR-300HP
+++ b/sys/mips/conf/WZR-300HP
@@ -28,9 +28,6 @@ device                geom_uncompress # compressed in-memory filesystem hackery!
 
 options        ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
 
-# options      MD_ROOT
-# options      MD_ROOT_SIZE="6144"
-
 options        AR71XX_ATH_EEPROM       # Fetch EEPROM/PCI config from flash
 options        ATH_EEPROM_FIRMWARE     # Use EEPROM from flash
 device         firmware                # Used by the above
@@ -42,10 +39,11 @@ device          miiproxy                # MDIO bus <-> MII PHY rendezvous
 device          etherswitch
 device          arswitch
 
-# Enable GPIO
-device         gpio
-device         gpioled
-
 # hwpmc
 device         hwpmc_mips24k
 device         hwpmc
+
+# load these via modules, shrink kernel
+nodevice       if_bridge
+nodevice       bridgestp
+nodevice       random

diff --git a/sys/mips/conf/WZR-300HP.hints b/sys/mips/conf/WZR-300HP.hints
index 07d8a717024241a71aae044678e0971d455c8400..2f22198879dabe73a4191874f4dd266cb36d5a82 100644 (file)
--- a/sys/mips/conf/WZR-300HP.hints
+++ b/sys/mips/conf/WZR-300HP.hints
@@ -5,11 +5,11 @@
 
 # arge1 MDIO bus
 hint.argemdio.0.at="nexus0"
-hint.argemdio.0.maddr=0x1a000000
+hint.argemdio.0.maddr=0x19000000
 hint.argemdio.0.msize=0x1000
 hint.argemdio.0.order=0
 
-hint.arge.0.phymask=0x0
+hint.arge.0.phymask=0x1
 hint.arge.0.media=1000
 hint.arge.0.fduplex=1
 hint.arge.0.eeprommac=0x1f05120c
@@ -17,9 +17,9 @@ hint.arge.0.mdio=mdioproxy1     # .. off of the switch mdiobus
 
 
 # arge1: nail to 1000/full, RMII - connected to the switch
-hint.arge.1.media=1000          # Map to 1000/full
-hint.arge.1.fduplex=1           #
-hint.arge.1.phymask=0x0         # no directly mapped PHYs
+#hint.arge.1.media=1000          # Map to 1000/full
+#hint.arge.1.fduplex=1           #
+#hint.arge.1.phymask=0x0         # no directly mapped PHYs
 
 #
 # AR7240 switch config
@@ -28,7 +28,7 @@ hint.arswitch.0.at="mdio0"
 hint.arswitch.0.is_7240=1       # We need to be explicitly told this
 hint.arswitch.0.numphys=4       # 4 active switch PHYs (PHY 0 -> 3)
 hint.arswitch.0.phy4cpu=1       # Yes, PHY 4 == dedicated PHY
-hint.arswitch.0.is_rgmii=0      # No, not RGMII
+hint.arswitch.0.is_rgmii=1      # No, not RGMII
 hint.arswitch.0.is_gmii=0       # No, not GMII
 
 # ath0 - slot 0