From owner-svn-src-head@FreeBSD.ORG Sat Jan 9 18:13:14 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CF801065670; Sat, 9 Jan 2010 18:13:14 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3C4768FC16; Sat, 9 Jan 2010 18:13:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o09IDEbk076756; Sat, 9 Jan 2010 18:13:14 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o09IDEwP076755; Sat, 9 Jan 2010 18:13:14 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201001091813.o09IDEwP076755@svn.freebsd.org> From: Warner Losh Date: Sat, 9 Jan 2010 18:13:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r201912 - head/sys/mips/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2010 18:13:14 -0000 Author: imp Date: Sat Jan 9 18:13:13 2010 New Revision: 201912 URL: http://svn.freebsd.org/changeset/base/201912 Log: Merge from projects/mips to head by hand: Copy over OCTEON1-32 file: the 32-bit variant of the octeon kernel config file. Added: - copied unchanged from r201911, projects/mips/sys/mips/conf/OCTEON1-32 Directory Properties: head/sys/mips/conf/OCTEON1-32 (props changed) Copied: head/sys/mips/conf/OCTEON1-32 (from r201911, projects/mips/sys/mips/conf/OCTEON1-32) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/conf/OCTEON1-32 Sat Jan 9 18:13:13 2010 (r201912, copy of r201911, projects/mips/sys/mips/conf/OCTEON1-32) @@ -0,0 +1,92 @@ +# OCTEON1 -- Configuration kernel for all Octeon1 SoCs from Cavium Networks +# +# For more information on this file, please read the handbook section on +# Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +machine mips +cpu CPU_MIPS4KC +ident OCTEON1 + +#makeoptions ARCH_FLAGS="-march=mips64 -mabi=64" +#makeoptions LDSCRIPT_NAME= ldscript.mips.mips64 + +# Don't build any modules yet. +makeoptions MODULES_OVERRIDE="" +makeoptions TARGET_BIG_ENDIAN=defined +makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.32 +#makeoptions TARGET_64BIT=defined + +options KERNVIRTADDR=0x80100000 +makeoptions KERNLOADADDR=0x80100000 +include "../octeon1/std.octeon1" + +hints "OCTEON1.hints" #Default places to look for devices. + +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols + +#XXXimp: Need to make work with 64-bit too +#options ISA_MIPS64 +options ISA_MIPS32 + +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 +#options ROOTDEVNAME=\"ufs:ad0s1a\" # Original +options NO_SWAPPING + + +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 + + +# Debugging for use in -current +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS #Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed + +#XXXimp device genclock +device loop +device ether +device md +device uart +nodevice uart_ns8250 +device rgmii +#options VERBOSE_SYSINIT + + +# +# Use the following for Compact Flash file-system +device cf +options ROOTDEVNAME = \"ufs:cf0s2\" # Unmask if compact flash is needed as RFS + +# +# Use the following for RFS in mem-device +#options MD_ROOT +#options ROOTDEVNAME = \"ufs:md0\" + +#options MD_ROOT_SIZE = 21264 +#XXX: Bring up UP first, then generalize. +#options SMP