svn commit: r221415 - in projects/pf/pf45: sys/arm/conf
sys/mips/conf usr.bin/rctl
Bjoern A. Zeeb
bz at FreeBSD.org
Wed May 4 01:07:33 UTC 2011
Author: bz
Date: Wed May 4 01:07:32 2011
New Revision: 221415
URL: http://svn.freebsd.org/changeset/base/221415
Log:
Cleanup some of the previously merged but not really tracked files to
reduce diffs to head. Reflect properties from head on the (locally)
added files.
Added:
projects/pf/pf45/sys/arm/conf/TS7800 (contents, props changed)
projects/pf/pf45/sys/mips/conf/PB92 (contents, props changed)
projects/pf/pf45/sys/mips/conf/PB92.hints (contents, props changed)
Modified:
projects/pf/pf45/usr.bin/rctl/rctl.8
Added: projects/pf/pf45/sys/arm/conf/TS7800
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/pf/pf45/sys/arm/conf/TS7800 Wed May 4 01:07:32 2011 (r221415)
@@ -0,0 +1,80 @@
+#
+# Custom kernel for the TS-7800 board.
+#
+# $FreeBSD$
+#
+
+ident TS7800
+include "../mv/orion/std.ts7800"
+
+options SOC_MV_ORION
+makeoptions MODULES_OVERRIDE=""
+
+#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
+makeoptions WERROR="-Werror"
+
+options SCHED_4BSD #4BSD scheduler
+options INET #InterNETworking
+options INET6 #IPv6 communications protocols
+options FFS #Berkeley Fast Filesystem
+options SOFTUPDATES # Enable FFS soft updates support
+options NFSCLIENT #Network Filesystem Client
+options NFSLOCKD #Network Lock Manager
+options NFS_ROOT #NFS usable as /, requires NFSCLIENT
+options BOOTP
+options BOOTP_NFSROOT
+options BOOTP_NFSV3
+options BOOTP_WIRED_TO=mge0
+
+options SYSVSHM #SYSV-style shared memory
+options SYSVMSG #SYSV-style message queues
+options SYSVSEM #SYSV-style semaphores
+options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options MUTEX_NOINLINE
+options RWLOCK_NOINLINE
+options NO_FFS_SNAPSHOT
+options NO_SWAPPING
+
+# Debugging
+options ALT_BREAK_TO_DEBUGGER
+options DDB
+options KDB
+options GDB # Support remote GDB.
+
+device mvs
+device pci
+
+# Pseudo devices
+device md
+device loop
+device pty
+device random
+
+# Serial ports
+device uart
+
+# Networking
+device ether
+device mge # Marvell Gigabit Ethernet controller
+device mii
+device e1000phy
+device bpf
+options HZ=1000
+
+# USB
+device usb
+device ehci
+device umass
+device scbus
+device pass
+device da
+
+# SATA
+device ata
+options ATA_CAM
+
+# Flattened Device Tree
+options FDT
+options FDT_DTB_STATIC
+makeoptions FDT_DTS_FILE=ts7800.dts
+
Added: projects/pf/pf45/sys/mips/conf/PB92
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/pf/pf45/sys/mips/conf/PB92 Wed May 4 01:07:32 2011 (r221415)
@@ -0,0 +1,100 @@
+#
+# PB92 -- Kernel configuration file for FreeBSD/mips for Atheros PB92 reference
+# board (AR7242)
+#
+# $FreeBSD$
+#
+
+ident PB92
+makeoptions KERNLOADADDR=0x80050000
+options HZ=1000
+
+hints "PB92.hints"
+include "../atheros/std.ar71xx"
+
+makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
+makeoptions MODULES_OVERRIDE=""
+
+options DDB
+options KDB
+
+options SCHED_4BSD #4BSD scheduler
+options INET #InterNETworking
+options INET6
+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 FFS #Berkeley Fast Filesystem
+#options SOFTUPDATES #Enable FFS soft updates support
+#options UFS_ACL #Support for access control lists
+#options UFS_DIRHASH #Improve performance on big directories
+
+options MD_ROOT
+options MD_ROOT_SIZE=5120
+device geom_uzip
+options GEOM_UZIP
+options ROOTDEVNAME=\"ufs:/dev/md0.uzip\"
+
+device pci
+device ar724x_pci
+
+# Wireless NIC cards
+options IEEE80211_DEBUG
+options IEEE80211_SUPPORT_MESH
+options IEEE80211_SUPPORT_TDMA
+device wlan # 802.11 support
+device wlan_wep # 802.11 WEP support
+device wlan_ccmp # 802.11 CCMP support
+device wlan_tkip # 802.11 TKIP support
+device wlan_xauth # 802.11 hostap support
+
+device ath # Atheros pci/cardbus NIC's
+device ath_pci # PCI/PCIe bus glue
+options ATH_DEBUG
+options ATH_ENABLE_11N
+options ATH_DIAGAPI
+
+device ath_hal
+options AH_SUPPORT_AR5416
+options AH_DEBUG
+options AH_DEBUG_ALQ
+
+device ath_rate_sample
+
+device mii
+device arge
+
+device usb
+options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
+options USB_DEBUG
+options USB_HOST_ALIGN=32
+device ehci
+
+device gpio
+device gpioled
+
+device spibus
+device ar71xx_spi
+device mx25l
+
+device ar71xx_wdog
+
+device uart
+
+device loop
+device ether
+device md
+device bpf
+device random
+device if_bridge
Added: projects/pf/pf45/sys/mips/conf/PB92.hints
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/pf/pf45/sys/mips/conf/PB92.hints Wed May 4 01:07:32 2011 (r221415)
@@ -0,0 +1,69 @@
+# $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
+
+# 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
+hint.ehci.0.msize=0x00ffff00
+hint.ehci.0.irq=1
+
+# pci
+hint.pcib.0.at="nexus0"
+hint.pcib.0.irq=0
+
+# arge0
+hint.arge.0.at="nexus0"
+hint.arge.0.maddr=0x19000000
+hint.arge.0.msize=0x1000
+hint.arge.0.irq=2
+
+# AR8316 workaround for now
+hint.arge.0.media=1000
+hint.arge.0.fduplex=1
+hint.arge.0.phymask=0x3
+
+# GPIO
+hint.gpio.0.at="apb0"
+hint.gpio.0.maddr=0x18040000
+hint.gpio.0.msize=0x1000
+hint.gpio.0.irq=2
+
+# Signal leds
+hint.gpioled.0.at="gpiobus0"
+hint.gpioled.0.name="sig1"
+hint.gpioled.0.pins=0x0001 # pin 0
+hint.gpioled.1.at="gpiobus0"
+hint.gpioled.1.name="sig2"
+hint.gpioled.1.pins=0x0002 # pin 1
+hint.gpioled.2.at="gpiobus0"
+hint.gpioled.2.name="sig3"
+hint.gpioled.2.pins=0x0800 # pin 11
+hint.gpioled.3.at="gpiobus0"
+hint.gpioled.3.name="sig4"
+hint.gpioled.3.pins=0x0080 # pin 7
+
+# SPI controller/bus
+hint.spi.0.at="nexus0"
+hint.spi.0.maddr=0x1f000000
+hint.spi.0.msize=0x10
+
+# SPI flash
+hint.mx25l.0.at="spibus0"
+hint.mx25l.0.cs=0
+
+# Watchdog
+hint.ar71xx_wdog.0.at="nexus0"
Modified: projects/pf/pf45/usr.bin/rctl/rctl.8
==============================================================================
--- projects/pf/pf45/usr.bin/rctl/rctl.8 Wed May 4 00:43:06 2011 (r221414)
+++ projects/pf/pf45/usr.bin/rctl/rctl.8 Wed May 4 01:07:32 2011 (r221415)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 14, 2011
+.Dd May 3, 2011
.Dt RCTL 8
.Os
.Sh NAME
@@ -90,7 +90,7 @@ Subject defines the kind of entity the r
It can be either process, user, login class, or jail.
.Pp
Subject ID identifies the subject. It can be user name,
-numerical user ID, login class name, jail name, or numerical jail ID.
+numerical user ID, login class name, or jail name.
.Pp
Resource identifies the resource the rule controls.
.Pp
@@ -177,9 +177,9 @@ Prevent user "joe" from allocating more
.Pp
Remove all RCTL rules.
.Pp
-.Dl rctl -hu jail:5
+.Dl rctl -hu jail:www
.Pp
-Display resource usage information for jail with JID 5.
+Display resource usage information for jail named "www".
.Pp
.Dl rctl -l process:512
.Pp
More information about the svn-src-projects
mailing list