svn commit: r221489 - head/sys/mips/conf
Adrian Chadd
adrian at FreeBSD.org
Thu May 5 09:04:50 UTC 2011
Author: adrian
Date: Thu May 5 09:04:49 2011
New Revision: 221489
URL: http://svn.freebsd.org/changeset/base/221489
Log:
Add nvram2env (untested) and geom_map (tested) to PB92.
Modified:
head/sys/mips/conf/PB92
head/sys/mips/conf/PB92.hints
Modified: head/sys/mips/conf/PB92
==============================================================================
--- head/sys/mips/conf/PB92 Thu May 5 08:11:22 2011 (r221488)
+++ head/sys/mips/conf/PB92 Thu May 5 09:04:49 2011 (r221489)
@@ -6,9 +6,13 @@
#
ident PB92
+# XXX The default load address in the Uboot environment is 0x80010000
makeoptions KERNLOADADDR=0x80050000
options HZ=1000
+# The PB92 has 32mb of RAM; hard-code that
+options AR71XX_REALMEM=32*1024*1024
+
hints "PB92.hints"
include "../atheros/std.ar71xx"
@@ -21,20 +25,17 @@ options KDB
options SCHED_4BSD #4BSD scheduler
options INET #InterNETworking
options INET6
-options NFSCLIENT #Network Filesystem Client
+# options NFSCLIENT #Network Filesystem Client
options PSEUDOFS #Pseudo-filesystem framework
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options ALQ
-# options NFS_LEGACYRPC
-#options NFS_DEBUG
-
# Debugging for use in -current
-options DEADLKRES
-options INVARIANTS
-options INVARIANT_SUPPORT
-options WITNESS
-options WITNESS_SKIPSPIN
+#options DEADLKRES
+#options INVARIANTS
+#options INVARIANT_SUPPORT
+#options WITNESS
+#options WITNESS_SKIPSPIN
options FFS #Berkeley Fast Filesystem
#options SOFTUPDATES #Enable FFS soft updates support
#options UFS_ACL #Support for access control lists
@@ -46,9 +47,13 @@ device geom_uzip
options GEOM_UZIP
options ROOTDEVNAME=\"ufs:/dev/md0.uzip\"
+# PCI bus
device pci
device ar724x_pci
+# NVRAM U-Boot Environment -> Kernel environment
+device nvram2env
+
# Wireless NIC cards
options IEEE80211_DEBUG
options IEEE80211_SUPPORT_MESH
@@ -75,23 +80,42 @@ device ath_rate_sample
device mii
device arge
+# USB devices - PB92 has EHCI only
+
device usb
options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
options USB_DEBUG
options USB_HOST_ALIGN=32
device ehci
+# Mass storage
+device scbus
+device umass
+device da
+
+# Read MSDOS formatted disks
+options GEOM_PART_BSD
+options GEOM_PART_MBR
+options MSDOSFS
+
+# GPIO Bus
device gpio
device gpioled
+# SPI and flash
device spibus
device ar71xx_spi
device mx25l
+# The flash is statically partitioned; add in that
+device geom_map
+
device ar71xx_wdog
+# Serial
device uart
+# Network twiddling
device loop
device ether
device md
Modified: head/sys/mips/conf/PB92.hints
==============================================================================
--- head/sys/mips/conf/PB92.hints Thu May 5 08:11:22 2011 (r221488)
+++ head/sys/mips/conf/PB92.hints Thu May 5 09:04:49 2011 (r221489)
@@ -9,12 +9,6 @@ hint.uart.0.maddr=0x18020003
hint.uart.0.msize=0x18
hint.uart.0.irq=3
-# ohci
-#hint.ohci.0.at="apb0"
-#hint.ohci.0.maddr=0x1b000000
-#hint.ohci.0.msize=0x01000000
-#hint.ohci.0.irq=1
-
#ehci - note the 0x100 offset for the AR913x/AR724x
hint.ehci.0.at="nexus0"
hint.ehci.0.maddr=0x1b000100
@@ -67,3 +61,53 @@ hint.mx25l.0.cs=0
# Watchdog
hint.ar71xx_wdog.0.at="nexus0"
+
+# nvram mapping - XXX ?
+hint.nvram.0.base=0x1f030000
+hint.nvram.0.maxsize=0x2000
+hint.nvram.0.flags=3 # 1 = No check, 2 = Format Generic
+hint.nvram.1.base=0x1f032000
+hint.nvram.1.maxsize=0x4000
+hint.nvram.1.flags=3 # 1 = No check, 2 = Format Generic
+
+# GEOM_MAP
+#
+# From my PB92 environment:
+#
+# mtdparts=ar7240-nor0:256k(u-boot),64k(u-boot-env),2752k(rootfs),896k(uImage),64k(NVRAM),64k(ART)
+
+hint.map.0.at="flash/spi0"
+hint.map.0.start=0x00000000
+hint.map.0.end=0x00040000 # 256k u-boot
+hint.map.0.name="u-boot"
+hint.map.0.readonly=1
+
+hint.map.1.at="flash/spi0"
+hint.map.1.start=0x00040000
+hint.map.1.end=0x00050000 # 64k u-boot-env
+hint.map.1.name="u-boot-env"
+hint.map.1.readonly=0
+
+hint.map.2.at="flash/spi0"
+hint.map.2.start=0x00050000
+hint.map.2.end=0x00300000 # 2752k rootfs
+hint.map.2.name="rootfs"
+hint.map.2.readonly=1
+
+hint.map.3.at="flash/spi0"
+hint.map.3.start=0x00300000
+hint.map.3.end=0x003e0000 # 896k uImage
+hint.map.3.name="uImage"
+hint.map.3.readonly=0
+
+hint.map.4.at="flash/spi0"
+hint.map.4.start=0x003e0000
+hint.map.4.end=0x003f0000 # 64k NVRAM
+hint.map.4.name="NVRAM"
+hint.map.4.readonly=0
+
+hint.map.5.at="flash/spi0"
+hint.map.5.start=0x003f0000
+hint.map.5.end=0x00400000 # 64k ART
+hint.map.5.name="ART"
+hint.map.5.readonly=1
More information about the svn-src-head
mailing list