head	1.4;
access;
symbols
	RELENG_8_4:1.4.0.2
	RELENG_9_1_0_RELEASE:1.3.2.1.4.2
	RELENG_9_1:1.3.2.1.0.4
	RELENG_9_1_BP:1.3.2.1
	RELENG_8_3_0_RELEASE:1.2.2.2.6.1
	RELENG_8_3:1.2.2.2.0.6
	RELENG_8_3_BP:1.2.2.2
	RELENG_9_0_0_RELEASE:1.3.2.1.2.1
	RELENG_9_0:1.3.2.1.0.2
	RELENG_9_0_BP:1.3.2.1
	RELENG_9:1.3.0.2
	RELENG_9_BP:1.3
	RELENG_8_2_0_RELEASE:1.2.2.2.4.1
	RELENG_8_2:1.2.2.2.0.4
	RELENG_8_2_BP:1.2.2.2
	RELENG_8_1_0_RELEASE:1.2.2.2.2.1
	RELENG_8_1:1.2.2.2.0.2
	RELENG_8_1_BP:1.2.2.2
	RELENG_8:1.2.0.2;
locks; strict;
comment	@# @;


1.4
date	2012.11.17.01.50.17;	author svnexp;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2010.07.15.16.32.59;	author luigi;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2009.12.28.01.25.05;	author luigi;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2009.12.27.21.58.48;	author luigi;	state Exp;
branches;
next	;

1.4.2.1
date	2012.11.17.01.50.17;	author svnexp;	state dead;
branches;
next	1.4.2.2;

1.4.2.2
date	2013.03.28.13.03.30;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.3.2.1.2.1
	1.3.2.1.4.1;
next	1.3.2.2;

1.3.2.2
date	2012.11.17.11.36.30;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.3.2.1.2.2;

1.3.2.1.2.2
date	2012.11.17.08.36.29;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.3.2.1.4.2;

1.3.2.1.4.2
date	2012.11.17.08.47.20;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2010.03.07.16.24.33;	author luigi;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2010.03.07.16.24.33;	author luigi;	state Exp;
branches
	1.2.2.2.2.1
	1.2.2.2.4.1
	1.2.2.2.6.1;
next	1.2.2.3;

1.2.2.3
date	2012.11.17.10.36.14;	author svnexp;	state Exp;
branches;
next	;

1.2.2.2.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.2.2.2.4.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.2.2.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.2.2.6.2;

1.2.2.2.6.2
date	2012.11.17.08.24.55;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Switching exporter and resync
@
text
@#
# $FreeBSD: head/release/picobsd/qemu/PICOBSD 210125 2010-07-15 16:32:59Z luigi $
# A configuration file to run tests on qemu.
# We disable SMP because it does not work well with qemu, and set HZ=1000
# to avoid it being overridden.
#
# Line starting with #PicoBSD contains PicoBSD build parameters
#marker         def_sz  init    MFS_inodes      floppy_inodes
#PicoBSD	18000	init	8192		32768
options MD_ROOT_SIZE=18000      # same as def_sz

hints	"PICOBSD.hints"

# values accessible through getenv()
# env		"PICOBSD.env"

#cpu		I486_CPU
cpu		I586_CPU
cpu		I686_CPU
ident		PICOBSD

# SMP seems to be needed for kern_et
options		SMP
device	apic

options		SCHED_ULE	# mandatory to have one scheduler
options		PREEMPTION	# needed for decent interrupt processing
#options	MATH_EMULATE		#Support for x87 emulation
options 	INET			#InterNETworking
#options	INET6
options 	FFS			#Berkeley Fast Filesystem
#options	BOOTP			#Use BOOTP to obtain IP address/hostname
options 	MD_ROOT			#MD is a potential root device

#options	NFS			#Network Filesystem
#options	NFS_ROOT		#NFS usable as root device, NFS required

#options 	MSDOSFS			#MSDOS Filesystem
#options 	CD9660			#ISO 9660 Filesystem
#options 	CD9660_ROOT		#CD-ROM usable as root, CD9660 required
#options	DEVFS			#Device Filesystem
#options 	PROCFS			#Process filesystem
options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]

options		KDB
options		DDB

options		IPFIREWALL
options		IPFIREWALL_DEFAULT_TO_ACCEPT
options		IPDIVERT		# divert (for natd)

# Support for bridging and bandwidth limiting
options		DUMMYNET
device		if_bridge
# Running with less than 1000 seems to give poor timing on
# qemu, so we set HZ explicitly.
options		HZ=1000

device		random			# used by ssh
device		pci

# Floppy drives
device		fdc

# ATA and ATAPI devices
#device		ata
#device		atadisk			# ATA disk drives
#device		atapicd			# ATAPI CDROM drives
#options		ATA_STATIC_ID		#Static device numbering

# atkbdc0 controls both the keyboard and the PS/2 mouse
device		atkbdc			# At keyboard controller
device		atkbd
#device		psm			# do we need the mouse ??

device		vga			# VGA screen

# syscons is the default console driver, resembling an SCO console
device		sc

# Serial (COM) ports
device		uart

# Audio support
#device		pcm

# PCCARD (PCMCIA) support
#device		card		# pccard bus
#device		pcic		# PCMCIA bridge

# Parallel port
#device		ppc
#device		ppbus		# Parallel port bus (required)
#device		lpt		# Printer
#device		plip		# TCP/IP over parallel
#device		ppi		# Parallel port interface device

#
# The following Ethernet NICs are all PCI devices.
#
device	miibus 
device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
device		nfe		# nVidia nForce MCP on-board Ethernet
#device		xl		# 3Com
device		rl		# RealTek 8129/8139
device		re		# RealTek 8139C+/8169/8169S/8110S
device		sis		# National/SiS
device		dc		# DEC/Intel 21143 and various workalikes
device		ed

device		loop		# Network loopback
device		ether		# Ethernet support
device		tun		# Packet tunnel.
device		pty		# Pseudo-ttys (telnet etc)
device		md		# Memory "disks"
#device		gif	4	# IPv6 and IPv4 tunneling
#device		faith	1	# IPv6-to-IPv4 relaying (translation)
device		tap

#options 	VIMAGE		# soner or later we may want to test this
#options               DEVICE_POLLING

# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
device		bpf		# Berkeley packet filter
@


1.4.2.1
log
@file PICOBSD was added on branch RELENG_8_4 on 2013-03-28 13:03:30 +0000
@
text
@d1 125
@


1.4.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 122
#
# $FreeBSD: releng/8.4/release/picobsd/qemu/PICOBSD 204839 2010-03-07 16:24:33Z luigi $
# A configuration file to run tests on qemu.
# We disable SMP because it does not work well with qemu, and set HZ=1000
# to avoid it being overridden.
#
# Line starting with #PicoBSD contains PicoBSD build parameters
#marker         def_sz  init    MFS_inodes      floppy_inodes
#PicoBSD	18000	init	8192		32768
options MD_ROOT_SIZE=18000      # same as def_sz

hints	"PICOBSD.hints"

# values accessible through getenv()
# env		"PICOBSD.env"

#cpu		I486_CPU
cpu		I586_CPU
cpu		I686_CPU
ident		PICOBSD

#options		SMP
#device	apic

options		SCHED_4BSD		# mandatory to have one scheduler
#options	MATH_EMULATE		#Support for x87 emulation
options 	INET			#InterNETworking
#options	INET6
options 	FFS			#Berkeley Fast Filesystem
#options	BOOTP			#Use BOOTP to obtain IP address/hostname
options 	MD_ROOT			#MD is a potential root device

#options	NFS			#Network Filesystem
#options	NFS_ROOT		#NFS usable as root device, NFS required

#options 	MSDOSFS			#MSDOS Filesystem
#options 	CD9660			#ISO 9660 Filesystem
#options 	CD9660_ROOT		#CD-ROM usable as root, CD9660 required
#options	DEVFS			#Device Filesystem
#options 	PROCFS			#Process filesystem
options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]

options		KDB
options		DDB

options		IPFIREWALL
options		IPFIREWALL_DEFAULT_TO_ACCEPT
options		IPDIVERT		# divert (for natd)

# Support for bridging and bandwidth limiting
options		DUMMYNET
device		if_bridge
# Running with less than 1000 seems to give poor timing on
# qemu, so we set HZ explicitly.
options		HZ=1000

device		random			# used by ssh
device		pci

# Floppy drives
device		fdc

# ATA and ATAPI devices
#device		ata
#device		atadisk			# ATA disk drives
#device		atapicd			# ATAPI CDROM drives
#options		ATA_STATIC_ID		#Static device numbering

# atkbdc0 controls both the keyboard and the PS/2 mouse
device		atkbdc			# At keyboard controller
device		atkbd
#device		psm			# do we need the mouse ??

device		vga			# VGA screen

# syscons is the default console driver, resembling an SCO console
device		sc

# Serial (COM) ports
device		uart

# Audio support
#device		pcm

# PCCARD (PCMCIA) support
#device		card		# pccard bus
#device		pcic		# PCMCIA bridge

# Parallel port
#device		ppc
#device		ppbus		# Parallel port bus (required)
#device		lpt		# Printer
#device		plip		# TCP/IP over parallel
#device		ppi		# Parallel port interface device

#
# The following Ethernet NICs are all PCI devices.
#
device	miibus 
device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
device		nfe		# nVidia nForce MCP on-board Ethernet
#device		xl		# 3Com
device		rl		# RealTek 8129/8139
device		re		# RealTek 8139C+/8169/8169S/8110S
device		sis		# National/SiS
device		dc		# DEC/Intel 21143 and various workalikes
device		ed

device		loop		# Network loopback
device		ether		# Ethernet support
device		tun		# Packet tunnel.
device		pty		# Pseudo-ttys (telnet etc)
device		md		# Memory "disks"
#device		gif	4	# IPv6 and IPv4 tunneling
#device		faith	1	# IPv6-to-IPv4 relaying (translation)
device		tap

#options               DEVICE_POLLING

# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
device		bpf		# Berkeley packet filter
@


1.3
log
@SVN rev 210125 on 2010-07-15 16:32:59Z by luigi

add some modern stuff: SMP, SCHED_ULE, PREEMPTION
and support for VIMAGE
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.3.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.3.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/release/picobsd/qemu/PICOBSD 210125 2010-07-15 16:32:59Z luigi $
@


1.3.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.3.2.1.4.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/release/picobsd/qemu/PICOBSD 210125 2010-07-15 16:32:59Z luigi $
@


1.3.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.3.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/release/picobsd/qemu/PICOBSD 210125 2010-07-15 16:32:59Z luigi $
@


1.2
log
@SVN rev 201076 on 2009-12-28 01:25:05Z by luigi

make the memory filesystem larger, and add an example
on how to import files from the host
@
text
@d22 3
a24 2
#options		SMP
#device	apic
d26 2
a27 1
options		SCHED_4BSD		# mandatory to have one scheduler
d120 1
@


1.2.2.1
log
@file PICOBSD was added on branch RELENG_8 on 2010-03-07 16:24:47 +0000
@
text
@d1 122
@


1.2.2.2
log
@SVN rev 204839 on 2010-03-07 16:24:33Z by luigi

MFC qemu configuration
@
text
@a0 122
#
# $FreeBSD$
# A configuration file to run tests on qemu.
# We disable SMP because it does not work well with qemu, and set HZ=1000
# to avoid it being overridden.
#
# Line starting with #PicoBSD contains PicoBSD build parameters
#marker         def_sz  init    MFS_inodes      floppy_inodes
#PicoBSD	18000	init	8192		32768
options MD_ROOT_SIZE=18000      # same as def_sz

hints	"PICOBSD.hints"

# values accessible through getenv()
# env		"PICOBSD.env"

#cpu		I486_CPU
cpu		I586_CPU
cpu		I686_CPU
ident		PICOBSD

#options		SMP
#device	apic

options		SCHED_4BSD		# mandatory to have one scheduler
#options	MATH_EMULATE		#Support for x87 emulation
options 	INET			#InterNETworking
#options	INET6
options 	FFS			#Berkeley Fast Filesystem
#options	BOOTP			#Use BOOTP to obtain IP address/hostname
options 	MD_ROOT			#MD is a potential root device

#options	NFS			#Network Filesystem
#options	NFS_ROOT		#NFS usable as root device, NFS required

#options 	MSDOSFS			#MSDOS Filesystem
#options 	CD9660			#ISO 9660 Filesystem
#options 	CD9660_ROOT		#CD-ROM usable as root, CD9660 required
#options	DEVFS			#Device Filesystem
#options 	PROCFS			#Process filesystem
options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]

options		KDB
options		DDB

options		IPFIREWALL
options		IPFIREWALL_DEFAULT_TO_ACCEPT
options		IPDIVERT		# divert (for natd)

# Support for bridging and bandwidth limiting
options		DUMMYNET
device		if_bridge
# Running with less than 1000 seems to give poor timing on
# qemu, so we set HZ explicitly.
options		HZ=1000

device		random			# used by ssh
device		pci

# Floppy drives
device		fdc

# ATA and ATAPI devices
#device		ata
#device		atadisk			# ATA disk drives
#device		atapicd			# ATAPI CDROM drives
#options		ATA_STATIC_ID		#Static device numbering

# atkbdc0 controls both the keyboard and the PS/2 mouse
device		atkbdc			# At keyboard controller
device		atkbd
#device		psm			# do we need the mouse ??

device		vga			# VGA screen

# syscons is the default console driver, resembling an SCO console
device		sc

# Serial (COM) ports
device		uart

# Audio support
#device		pcm

# PCCARD (PCMCIA) support
#device		card		# pccard bus
#device		pcic		# PCMCIA bridge

# Parallel port
#device		ppc
#device		ppbus		# Parallel port bus (required)
#device		lpt		# Printer
#device		plip		# TCP/IP over parallel
#device		ppi		# Parallel port interface device

#
# The following Ethernet NICs are all PCI devices.
#
device	miibus 
device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
device		nfe		# nVidia nForce MCP on-board Ethernet
#device		xl		# 3Com
device		rl		# RealTek 8129/8139
device		re		# RealTek 8139C+/8169/8169S/8110S
device		sis		# National/SiS
device		dc		# DEC/Intel 21143 and various workalikes
device		ed

device		loop		# Network loopback
device		ether		# Ethernet support
device		tun		# Packet tunnel.
device		pty		# Pseudo-ttys (telnet etc)
device		md		# Memory "disks"
#device		gif	4	# IPv6 and IPv4 tunneling
#device		faith	1	# IPv6-to-IPv4 relaying (translation)
device		tap

#options               DEVICE_POLLING

# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
device		bpf		# Berkeley packet filter
@


1.2.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/release/picobsd/qemu/PICOBSD 204839 2010-03-07 16:24:33Z luigi $
@


1.2.2.2.6.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.2.2.6.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/release/picobsd/qemu/PICOBSD 204839 2010-03-07 16:24:33Z luigi $
@


1.2.2.2.4.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.2.2.2.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.1
log
@SVN rev 201062 on 2009-12-27 21:58:48Z by luigi

add a 'qemu' floppy type, useful for running tests on new kernels
@
text
@d9 2
a10 2
#PicoBSD	8000	init	8192		32768
options MD_ROOT_SIZE=8000      # same as def_sz
@

