head	1.17;
access;
symbols
	RELENG_8_4:1.17.0.2
	RELENG_9_1_0_RELEASE:1.14.2.1.4.2
	RELENG_9_1:1.14.2.1.0.4
	RELENG_9_1_BP:1.14.2.1
	RELENG_8_3_0_RELEASE:1.13.2.3.2.1
	RELENG_8_3:1.13.2.3.0.2
	RELENG_8_3_BP:1.13.2.3
	RELENG_9_0_0_RELEASE:1.14.2.1.2.1
	RELENG_9_0:1.14.2.1.0.2
	RELENG_9_0_BP:1.14.2.1
	RELENG_9:1.14.0.2
	RELENG_9_BP:1.14
	RELENG_8_2_0_RELEASE:1.13.2.2.2.1
	RELENG_8_2:1.13.2.2.0.2
	RELENG_8_2_BP:1.13.2.2
	RELENG_8:1.13.0.2;
locks; strict;
comment	@# @;


1.17
date	2012.11.17.01.52.48;	author svnexp;	state Exp;
branches
	1.17.2.1;
next	1.16;

1.16
date	2012.03.29.02.54.35;	author jmallett;	state Exp;
branches;
next	1.15;

1.15
date	2012.03.12.21.25.32;	author jmallett;	state Exp;
branches;
next	1.14;

1.14
date	2010.12.16.05.13.41;	author gonzo;	state Exp;
branches
	1.14.2.1;
next	1.13;

1.13
date	2010.11.13.22.34.12;	author imp;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	2010.11.10.00.28.20;	author imp;	state Exp;
branches;
next	1.11;

1.11
date	2010.09.15.05.29.13;	author neel;	state Exp;
branches;
next	1.10;

1.10
date	2010.04.23.19.20.56;	author jmallett;	state Exp;
branches;
next	1.9;

1.9
date	2010.04.17.01.49.50;	author jmallett;	state Exp;
branches;
next	1.8;

1.8
date	2010.04.16.23.42.19;	author jmallett;	state Exp;
branches;
next	1.7;

1.7
date	2010.02.20.06.39.14;	author neel;	state Exp;
branches;
next	1.6;

1.6
date	2010.02.15.23.44.48;	author attilio;	state Exp;
branches;
next	1.5;

1.5
date	2010.02.12.02.59.49;	author neel;	state Exp;
branches;
next	1.4;

1.4
date	2010.02.10.16.30.04;	author attilio;	state Exp;
branches;
next	1.3;

1.3
date	2010.02.04.06.44.42;	author neel;	state Exp;
branches;
next	1.2;

1.2
date	2010.01.12.20.52.41;	author rpaulo;	state Exp;
branches;
next	1.1;

1.1
date	2010.01.09.18.08.31;	author imp;	state Exp;
branches;
next	;

1.17.2.1
date	2012.11.17.01.52.48;	author svnexp;	state dead;
branches;
next	1.17.2.2;

1.17.2.2
date	2013.03.28.13.05.15;	author svnexp;	state Exp;
branches;
next	;

1.14.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.14.2.1.2.1
	1.14.2.1.4.1;
next	1.14.2.2;

1.14.2.2
date	2012.11.17.11.37.15;	author svnexp;	state Exp;
branches;
next	;

1.14.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.14.2.1.2.2;

1.14.2.1.2.2
date	2012.11.17.08.37.11;	author svnexp;	state Exp;
branches;
next	;

1.14.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.14.2.1.4.2;

1.14.2.1.4.2
date	2012.11.17.08.48.02;	author svnexp;	state Exp;
branches;
next	;

1.13.2.1
date	2010.11.27.12.26.40;	author jchandra;	state dead;
branches;
next	1.13.2.2;

1.13.2.2
date	2010.11.27.12.26.40;	author jchandra;	state Exp;
branches
	1.13.2.2.2.1;
next	1.13.2.3;

1.13.2.3
date	2011.04.27.17.07.22;	author pluknet;	state Exp;
branches
	1.13.2.3.2.1;
next	1.13.2.4;

1.13.2.4
date	2012.11.17.10.36.54;	author svnexp;	state Exp;
branches;
next	;

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

1.13.2.3.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.13.2.3.2.2;

1.13.2.3.2.2
date	2012.11.17.08.25.31;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.17
log
@Switching exporter and resync
@
text
@#
# $FreeBSD: head/sys/mips/conf/SWARM 233644 2012-03-29 02:54:35Z jmallett $
#

include		"std.SWARM"

ident		SWARM

machine		mips mips

makeoptions	ARCH_FLAGS="-mabi=32 -march=mips32"
makeoptions	LDSCRIPT_NAME=	ldscript.mips.cfe
@


1.17.2.1
log
@file SWARM was added on branch RELENG_8_4 on 2013-03-28 13:05:15 +0000
@
text
@d1 12
@


1.17.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 12
#
# $FreeBSD: releng/8.4/sys/mips/conf/SWARM 221122 2011-04-27 17:07:22Z pluknet $
#

include		"std.SWARM"

ident		SWARM

options		ISA_MIPS32

makeoptions	ARCH_FLAGS="-mabi=32 -march=mips32"
makeoptions	LDSCRIPT_NAME=	ldscript.mips.cfe
@


1.16
log
@SVN rev 233644 on 2012-03-29 02:54:35Z by jmallett

Assume a big-endian default on MIPS and drop the "eb" suffix from MACHINE_ARCH.
This makes our naming scheme more closely match other systems and the
expectations of much third-party software.  MIPS builds which are little-endian
should require and exhibit no changes.  Big-endian TARGET_ARCHes must be
changed:
	From:		To:
	mipseb		mips
	mipsn32eb	mipsn32
	mips64eb	mips64

An entry has been added to UPDATING and some foot-shooting protection (complete
with warnings which should become errors in the near future) to the top-level
base system Makefile.
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.15
log
@SVN rev 232896 on 2012-03-12 21:25:32Z by jmallett

o) Use ABI, not ISA_* options, to determine whether to compile bits if libkern
   required for the ABI the kernel is being built for.
   XXX This is implemented in a kind-of nasty way that involves including source
       files, but it's still an improvement.
o) Retire ISA_* options since they're unused and were always wrong.
@
text
@d9 1
a9 1
machine		mips mipseb
@


1.14
log
@SVN rev 216475 on 2010-12-16 05:13:41Z by gonzo

- include argument should be in quotes
@
text
@a9 1
options		ISA_MIPS32
@


1.14.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.14.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/sys/mips/conf/SWARM 216475 2010-12-16 05:13:41Z gonzo $
@


1.14.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.14.2.1.4.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/sys/mips/conf/SWARM 216475 2010-12-16 05:13:41Z gonzo $
@


1.14.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.14.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/sys/mips/conf/SWARM 216475 2010-12-16 05:13:41Z gonzo $
@


1.13
log
@SVN rev 215270 on 2010-11-13 22:34:12Z by imp

Remove the 'machine mips' from DEFAULTS.  Put the proper 'machine mips
mipsel' or 'machine mips mipseb' into the config file (with a few 64's
tossed in for good measure).  This will let us build the proper
kernels with different worlds as part of make universe.
@
text
@d5 1
a5 1
include		std.SWARM
@


1.13.2.1
log
@file SWARM was added on branch RELENG_8 on 2010-11-27 12:29:01 +0000
@
text
@d1 13
@


1.13.2.2
log
@SVN rev 215938 on 2010-11-27 12:26:40Z by jchandra

Merge MIPS platform support to 8-STABLE.

This commit merges the MIPS platform changes that was now stable in
-CURRENT into 8-STABLE. The MIPS changesets are too many (~400) to list
here. But the changesets merged in this commit that affect other platforms
are summarized below:

r204635 : (changes to sys/dev/hwpmc, lib/libpmc, sys/sys/pmc.h)
Add support for hwpmc(4) on the MIPS 24K, 32 bit, embedded processor.

r205845: (changes to sys/modules/Makefile)
Fix for building modules on mips and arm.

r204031: (changes to sys/kern/link_elf_obj.c)
printf fix, as part of kernel module support for MIPS.

r206404: (changes to sys/arm/include/bus.h)
Add BUS_SPACE_UNRESTRICTED and define it to be ~0, just like all the
other platforms - for arm and mips.

r206819: (changes to sys/vm/)
Add VMFS_TLB_ALIGNED_SPACE option and kmem_alloc_nofault_space(), which
is used to allocate kernel stack address on MIPS.

r208165, r211087: (sys/kern/subr_smp.c, sys/kern/sched_ule.c)
Enable ULE scheduler for MIPS, Fix for an issue in SMP when 32 cpus are
enabled.

r208659: (sys/{ia64/ia64,mips/mips,sun4v/sun4v}/pmap.c)
Simplify the inner loop of get_pv_entry()

r208794: (changes to sys/vm/)
Make vm_contig_grow_cache() extern, and use it when vm_phys_alloc_contig()
fails to allocate MIPS page table pages.

r210327:  (changes to sys/vm/)
Support for MIPS page table page allocation.  Add a new function 'vm_page_t
vm_page_alloc_freelist(int flind, int order, int req)' to vm/vm_page.c to
allocate a page from a specified freelist, and other related changes.

Reviewed by:	alc(vm changes only)
Approved by:	kib(re), alc(vm), imp(mips), jmallett(mips), gnn(mips pmc)
@
text
@a0 12
#
# $FreeBSD$
#

include		std.SWARM

ident		SWARM

options		ISA_MIPS32

makeoptions	ARCH_FLAGS="-mabi=32 -march=mips32"
makeoptions	LDSCRIPT_NAME=	ldscript.mips.cfe
@


1.13.2.3
log
@SVN rev 221122 on 2011-04-27 17:07:22Z by pluknet

MFC r216475 (by gonzo):
- include argument should be in quotes
@
text
@d5 1
a5 1
include		"std.SWARM"
@


1.13.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
@d2 1
a2 1
# $FreeBSD: stable/8/sys/mips/conf/SWARM 221122 2011-04-27 17:07:22Z pluknet $
@


1.13.2.3.2.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.13.2.3.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/sys/mips/conf/SWARM 221122 2011-04-27 17:07:22Z pluknet $
@


1.13.2.2.2.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.12
log
@SVN rev 215068 on 2010-11-10 00:28:20Z by imp

rename SWARM_COMMON to std.SWARM so universe doesn't try to build it standalone
@
text
@d9 1
@


1.11
log
@SVN rev 212633 on 2010-09-15 05:29:13Z by neel

Factor out the common parts of the swarm board in SWARM_COMMON and start
including that in SWARM and SWARM_SMP kernel configs.
@
text
@d5 1
a5 1
include		SWARM_COMMON
@


1.10
log
@SVN rev 207131 on 2010-04-23 19:20:56Z by jmallett

o) Remove default MAXMEM on SWARM; pmap can readily use lmem for >512M
   physical addresses.
o) Set a local maxmem in sb_machdep.c to avoid trying to use pages over 2^64
   under 32-bit ABIs.  Our pmap needs corrected to use vm_paddr_t consistently,
   then we can make vm_paddr_t 64-bit under 32-bit ABIs and add code in pmap
   to limit phys_avail by the maximum PFN that a 32-bit PTE can hold.
@
text
@d5 2
a7 4
options		CPU_SB1

files		"../sibyte/files.sibyte"
hints		"SWARM.hints"
d9 1
a9 4
options		CFE
options		CFE_CONSOLE
options		CFE_ENV
options		ALT_BREAK_TO_DEBUGGER
d11 1
a12 54

#cpu		CPU_MIPS64
#options 	ISA_MIPS64
#makeoptions	ARCH_FLAGS="-march=mips64 -mgp64 -mabi=o64"
cpu		CPU_MIPS32
options 	ISA_MIPS32
makeoptions	ARCH_FLAGS="-march=mips32"

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		NFSCLIENT		#Network Filesystem Client
options		NFS_ROOT		#NFS usable as /, requires NFSCLIENT
options		PSEUDOFS		#Pseudo-filesystem framework
options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions

# Debugging for use in -current
#options 	DEADLKRES
options		INVARIANTS
options		INVARIANT_SUPPORT
options		WITNESS

options 	FFS			#Fast filesystem

options		KTRACE

device		pci
device		miibus
device		bge
device		loop
device		ether
device		md
device		random

options		USB_DEBUG
device usb
device ohci
device uhci
device ehci

device umass

device scbus
device da

device		ata
device		atadisk
device		atapicd
options		ATA_STATIC_ID
@


1.9
log
@SVN rev 206718 on 2010-04-17 01:49:50Z by jmallett

o) Back out my previous change to SWARM; some of it was to address an issue
   that turned out to be unrelated, and the rest was, as pointed out by Neel,
   just wrong-headed.
o) Tweak mem.c to fix use of /dev/kmem for direct-mapped addresses.
@
text
@a10 6
#
# 32-bit kernel cannot deal with physical memory beyond 4GB
# XXX pmap assumes that all the memory can be mapped using KSEG0
#
options		MAXMEM=512*1024

@


1.8
log
@SVN rev 206712 on 2010-04-16 23:42:19Z by jmallett

Set KERNLOADADDR and TARGET_BIG_ENDIAN for SWARM.
@
text
@a21 3
# Don't build any modules yet.
makeoptions	MODULES_OVERRIDE=""
makeoptions	TARGET_BIG_ENDIAN=defined
a23 2
makeoptions	KERNLOADADDR=0x81000000

@


1.7
log
@SVN rev 204108 on 2010-02-20 06:39:14Z by neel

Get rid of unused options: KERNPHYSADDR, KERNVIRTADDR, PHYSADDR, PHYS_ADDR_64BIT

Discussed with: gonzo, imp
@
text
@d22 3
d27 2
@


1.6
log
@SVN rev 203938 on 2010-02-15 23:44:48Z by attilio

Adjust style (following the already existing rules) for the newly
introduced option DEADLKRES.

Reported by:	danfe, julian, avg
@
text
@a21 5
# cfe loader expects kernel at 0x80001000 for mips32 w/o backwards
# offsets in the linked elf image (see ldscript hack)
# XXX can we conditionalize the linker stuff on options CFE?
options		KERNVIRTADDR=0x80001000

@


1.5
log
@SVN rev 203796 on 2010-02-12 02:59:49Z by neel

Remove the PCI_IOSPACE_SIZE and PCI_IOSPACE_ADDR hack from nexus.c. Implement
this in the Sibyte PCI hostbridge driver instead.

The nexus driver sees resource allocation requests for memory and irq
resources only. These are legitimate resources on all MIPS platforms.

Suggested by: imp
@
text
@d50 1
a50 1
#options	DEADLKRES
@


1.4
log
@SVN rev 203758 on 2010-02-10 16:30:04Z by attilio

Add the options DEADLKRES (introducing the deadlock resolver thread) in
the 'debugging' section of any HEAD kernel and enable for the mainstream
ones, excluding the embedded architectures.
It may, of course, enabled on a case-by-case basis.

Sponsored by:	Sandvine Incorporated
Requested by:	emaste
Discussed with:	kib
@
text
@a10 3
options		PCI_IOSPACE_ADDR=0xFC000000
options		PCI_IOSPACE_SIZE=0x02000000

@


1.3
log
@SVN rev 203477 on 2010-02-04 06:44:42Z by neel

Compile SWARM with KTRACE support.
@
text
@d53 1
@


1.2
log
@SVN rev 202171 on 2010-01-12 20:52:41Z by rpaulo

Fix svn properties and remove a P4 keyword.
@
text
@d59 2
@


1.1
log
@SVN rev 201908 on 2010-01-09 18:08:31Z by imp

Merge from pprojects/mips to head by hand.

Copy over the SWARM config file.
@
text
@d2 1
a2 1
# $Id: //depot/user/neelnatu/freebsd_sibyte/src/sys/mips/conf/SWARM#7 $
@

