head	1.10;
access;
symbols
	RELENG_8_4:1.10.0.2
	RELENG_9_1_0_RELEASE:1.4.2.2.2.2
	RELENG_9_1:1.4.2.2.0.2
	RELENG_9_1_BP:1.4.2.2
	RELENG_8_3_0_RELEASE:1.1.2.3.6.1
	RELENG_8_3:1.1.2.3.0.6
	RELENG_8_3_BP:1.1.2.3
	RELENG_9_0_0_RELEASE:1.4.2.1.2.1
	RELENG_9_0:1.4.2.1.0.2
	RELENG_9_0_BP:1.4.2.1
	RELENG_9:1.4.0.2
	RELENG_9_BP:1.4
	RELENG_8_2_0_RELEASE:1.1.2.3.4.1
	RELENG_8_2:1.1.2.3.0.4
	RELENG_8_2_BP:1.1.2.3
	RELENG_8_1_0_RELEASE:1.1.2.3.2.1
	RELENG_8_1:1.1.2.3.0.2
	RELENG_8_1_BP:1.1.2.3
	RELENG_8_0_0_RELEASE:1.1.2.2.2.1
	RELENG_8_0:1.1.2.2.0.2
	RELENG_8_0_BP:1.1.2.2
	RELENG_8:1.1.0.2;
locks; strict;
comment	@# @;


1.10
date	2013.01.27.00.41.28;	author svnexp;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	2012.11.17.01.51.09;	author svnexp;	state Exp;
branches;
next	1.8;

1.8
date	2012.09.16.19.48.48;	author jmg;	state Exp;
branches;
next	1.7;

1.7
date	2012.05.18.14.41.14;	author gber;	state Exp;
branches;
next	1.6;

1.6
date	2012.03.21.08.38.42;	author ed;	state Exp;
branches;
next	1.5;

1.5
date	2011.11.19.16.30.06;	author raj;	state Exp;
branches;
next	1.4;

1.4
date	2011.08.07.20.16.46;	author rmacklem;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2010.06.13.13.28.53;	author raj;	state Exp;
branches;
next	1.2;

1.2
date	2010.04.22.21.31.34;	author thompsa;	state Exp;
branches;
next	1.1;

1.1
date	2009.08.25.10.09.25;	author raj;	state Exp;
branches
	1.1.2.1;
next	;

1.10.2.1
date	2013.01.27.00.41.28;	author svnexp;	state dead;
branches;
next	1.10.2.2;

1.10.2.2
date	2013.03.28.13.03.58;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.4.2.1.2.1;
next	1.4.2.2;

1.4.2.2
date	2012.04.21.20.22.02;	author raj;	state Exp;
branches
	1.4.2.2.2.1;
next	1.4.2.3;

1.4.2.3
date	2012.11.17.11.36.45;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.4.2.1.2.2;

1.4.2.1.2.2
date	2012.11.17.08.36.44;	author svnexp;	state Exp;
branches;
next	;

1.4.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.4.2.2.2.2;

1.4.2.2.2.2
date	2012.11.17.08.47.34;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2009.09.16.12.07.58;	author raj;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2009.09.16.12.07.58;	author raj;	state Exp;
branches
	1.1.2.2.2.1;
next	1.1.2.3;

1.1.2.3
date	2010.04.29.22.44.04;	author thompsa;	state Exp;
branches
	1.1.2.3.2.1
	1.1.2.3.4.1
	1.1.2.3.6.1;
next	1.1.2.4;

1.1.2.4
date	2012.11.17.10.36.25;	author svnexp;	state Exp;
branches;
next	;

1.1.2.2.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

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

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

1.1.2.3.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.1.2.3.6.2;

1.1.2.3.6.2
date	2012.11.17.08.25.06;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.10
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/245954
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@#
# Custom kernel for Marvell SheevaPlug devices.
#
# $FreeBSD: head/sys/arm/conf/SHEEVAPLUG 245954 2013-01-27 00:39:02Z ian $
#

ident		SHEEVAPLUG
include		"../mv/kirkwood/std.db88f6xxx"

options 	SOC_MV_KIRKWOOD
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 	NANDFS			#NAND Filesystem
options 	NFSCL			#New Network Filesystem Client
options 	NFSLOCKD		#Network Lock Manager
options 	NFS_ROOT		#NFS usable as /, requires NFSCL
options 	BOOTP
options 	BOOTP_NFSROOT
options 	BOOTP_NFSV3
options 	BOOTP_WIRED_TO=mge0

# Root fs on USB device
#options 	ROOTDEVNAME=\"ufs:/dev/da0a\"

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

# Pseudo devices
device		random
device		loop

# Serial ports
device		uart

# Networking
device		ether
device		mge			# Marvell Gigabit Ethernet controller
device		mii
device		e1000phy
device		bpf
options 	HZ=1000
options 	DEVICE_POLLING
device		vlan

device		cesa			# Marvell security engine
device		crypto
device		cryptodev

# USB
options 	USB_DEBUG	# enable debug msgs
device		usb
device		ehci
device		umass
device		scbus
device		pass
device		da

# NAND
device		nand

# Flattened Device Tree
options 	FDT
options 	FDT_DTB_STATIC
makeoptions	FDT_DTS_FILE=sheevaplug.dts
@


1.10.2.1
log
@file SHEEVAPLUG was added on branch RELENG_8_4 on 2013-03-28 13:03:58 +0000
@
text
@d1 82
@


1.10.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 71
#
# Custom kernel for Marvell SheevaPlug devices.
#
# $FreeBSD: releng/8.4/sys/arm/conf/SHEEVAPLUG 207399 2010-04-29 22:44:04Z thompsa $
#

ident		SHEEVAPLUG
include		"../mv/kirkwood/std.sheevaplug"

options 	SOC_MV_KIRKWOOD
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 	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

# Root fs on USB device
#options 	ROOTDEVNAME=\"ufs:/dev/da0a\"

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

# Pseudo devices
device		random
device		pty
device		loop

# Serial ports
device		uart

# Networking
device		ether
device		mge			# Marvell Gigabit Ethernet controller
device		mii
device		e1000phy
device		bpf
options		HZ=1000
options		DEVICE_POLLING
device		vlan

# USB
options 	USB_DEBUG	# enable debug msgs
device		usb
device		ehci
device		umass
device		scbus
device		pass
device		da

@


1.9
log
@Switching exporter and resync
@
text
@d4 1
a4 1
# $FreeBSD: head/sys/arm/conf/SHEEVAPLUG 240572 2012-09-16 19:48:48Z jmg $
d8 1
a8 1
include		"../mv/kirkwood/std.sheevaplug"
@


1.8
log
@SVN rev 240572 on 2012-09-16 19:48:48Z by jmg

fix the kernel files to match our standard "option<space><tab>" format
such that when commenting/uncommentting lines, horizontal spacing is
maintained...

Also fix some minor comment formatting to line things up, etc...

Reviewed by:	gnn, imp
MFC after:	1 week
@
text
@d4 1
a4 1
# $FreeBSD$
@


1.7
log
@SVN rev 235609 on 2012-05-18 14:41:14Z by gber

Add architecture dependent code to support NAND Framework on Marvell SoCs.

Obtained from: Semihalf
Supported by:  FreeBSD Foundation, Juniper Networks
@
text
@d59 2
a60 2
options		HZ=1000
options		DEVICE_POLLING
d81 1
a81 1
options		FDT_DTB_STATIC
@


1.6
log
@SVN rev 233271 on 2012-03-21 08:38:42Z by ed

Remove pty(4) from our kernel configurations.

As of FreeBSD 8, this driver should not be used. Applications that use
posix_openpt(2) and openpty(3) use the pts(4) that is built into the
kernel unconditionally. If it turns out high profile depend on the
pty(4) module anyway, I'd rather get those fixed. So please report any
issues to me.

The pty(4) module is still available as a kernel module of course, so a
simple `kldload pty' can be used to run old-style pseudo-terminals.
@
text
@d20 1
d76 3
@


1.5
log
@SVN rev 227730 on 2011-11-19 16:30:06Z by raj

Initial version of cesa(4) driver for Marvell crypto engine and security
accelerator.

The following algorithms and schemes are supported:
 - 3DES, AES, DES
 - MD5, SHA1

Obtained from:	Semihalf
Written by:	Piotr Ziecik
@
text
@a46 1
device		pty
@


1.4
log
@SVN rev 224699 on 2011-08-07 20:16:46Z by rmacklem

Change all the sample kernel configurations to use
NFSCL, NFSD instead of NFSCLIENT, NFSSERVER since
NFSCL and NFSD are now the defaults. The client change is
needed for diskless configurations, so that the root
mount works for fstype nfs.
Reported by seanbru at yahoo-inc.com for i386/XEN.

Approved by:	re (hrs)
@
text
@d63 4
@


1.4.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.4.2.2
log
@SVN rev 234559 on 2012-04-21 20:22:02Z by raj

MFC r227730:

 Initial version of cesa(4) driver for Marvell crypto engine and security
 accelerator.

 The following algorithms and schemes are supported:
  - 3DES, AES, DES
  - MD5, SHA1

 Obtained from:	Semihalf
 Written by:	Piotr Ziecik
@
text
@a62 4
device		cesa			# Marvell security engine
device		crypto
device		cryptodev

@


1.4.2.3
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
@d4 1
a4 1
# $FreeBSD: stable/9/sys/arm/conf/SHEEVAPLUG 234559 2012-04-21 20:22:02Z raj $
@


1.4.2.2.2.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.4.2.2.2.2
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: releng/9.1/sys/arm/conf/SHEEVAPLUG 234559 2012-04-21 20:22:02Z raj $
@


1.4.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.4.2.1.2.2
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: releng/9.0/sys/arm/conf/SHEEVAPLUG 224699 2011-08-07 20:16:46Z rmacklem $
@


1.3
log
@SVN rev 209131 on 2010-06-13 13:28:53Z by raj

Convert Marvell ARM platforms to FDT convention.

The following systems are involved:

  - DB-88F5182
  - DB-88F5281
  - DB-88F6281
  - DB-78100
  - SheevaPlug

This overhaul covers the following major changes:

  - All integrated peripherals drivers for Marvell ARM SoC, which are
    currently in the FreeBSD source tree are reworked and adjusted so they
    derive config data out of the device tree blob (instead of hard coded /
    tabelarized values).

  - Since the common FDT infrastrucutre (fdtbus, simplebus) is used we say
    good by to obio / mbus drivers and numerous hard-coded config data.

Note that world needs to be built WITH_FDT for the affected platforms.

Reviewed by:	imp
Sponsored by:	The FreeBSD Foundation.
@
text
@d20 1
a20 1
options 	NFSCLIENT		#Network Filesystem Client
d22 1
a22 1
options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
@


1.2
log
@SVN rev 207077 on 2010-04-22 21:31:34Z by thompsa

Change USB_DEBUG to #ifdef and allow it to be turned off. Previously this had
the illusion of a tunable setting but was always turned on regardless.

MFC after:	1 week
@
text
@d72 4
@


1.1
log
@SVN rev 196536 on 2009-08-25 10:09:25Z by raj

Introduce SheevaPlug support.

  - The device is based on Marvell 88F6281 system on chip.
  - More info about the platform at http://www.plugcomputer.org

  - To build the FreeBSD kernel:
    make buildkernel TARGET_ARCH=arm KERNCONF=SHEEVAPLUG

  - Installation notes at: http://wiki.freebsd.org/FreeBSDMarvell

Submitted by:	Michal Hajduk
Obtained from:	Semihalf
@
text
@d64 1
@


1.1.2.1
log
@file SHEEVAPLUG was added on branch RELENG_8 on 2009-09-16 12:08:50 +0000
@
text
@d1 70
@


1.1.2.2
log
@SVN rev 197251 on 2009-09-16 12:07:58Z by raj

MFC r196531-196534,196536

Clean up Marvell platform code.

Introduce SheevaPlug support.

   - The device is based on Marvell 88F6281 system on chip.
   - More info about the platform at http://www.plugcomputer.org

   - To build the FreeBSD kernel:
     make buildkernel TARGET_ARCH=arm KERNCONF=SHEEVAPLUG

   - Installation notes at: http://wiki.freebsd.org/FreeBSDMarvell

Submitted by:	Michal Hajduk
Approved by:	re (kib)
Obtained from:	Semihalf
@
text
@a0 70
#
# Custom kernel for Marvell SheevaPlug devices.
#
# $FreeBSD$
#

ident		SHEEVAPLUG
include		"../mv/kirkwood/std.sheevaplug"

options 	SOC_MV_KIRKWOOD
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 	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

# Root fs on USB device
#options 	ROOTDEVNAME=\"ufs:/dev/da0a\"

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

# Pseudo devices
device		random
device		pty
device		loop

# Serial ports
device		uart

# Networking
device		ether
device		mge			# Marvell Gigabit Ethernet controller
device		mii
device		e1000phy
device		bpf
options		HZ=1000
options		DEVICE_POLLING
device		vlan

# USB
device		usb
device		ehci
device		umass
device		scbus
device		pass
device		da

@


1.1.2.3
log
@SVN rev 207399 on 2010-04-29 22:44:04Z by thompsa

MFC r207077

 Change USB_DEBUG to #ifdef and allow it to be turned off. Previously this had
 the illusion of a tunable setting but was always turned on regardless.
@
text
@a63 1
options 	USB_DEBUG	# enable debug msgs
@


1.1.2.4
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
@d4 1
a4 1
# $FreeBSD: stable/8/sys/arm/conf/SHEEVAPLUG 207399 2010-04-29 22:44:04Z thompsa $
@


1.1.2.3.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.1.2.3.6.2
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: releng/8.3/sys/arm/conf/SHEEVAPLUG 207399 2010-04-29 22:44:04Z thompsa $
@


1.1.2.3.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.1.2.3.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.2.2.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


