From owner-svn-src-head@FreeBSD.ORG Fri Sep 24 21:23:23 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 9E9F2106566C; Fri, 24 Sep 2010 21:23:23 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 730808FC13; Fri, 24 Sep 2010 21:23:23 +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 o8OLNNXP040138; Fri, 24 Sep 2010 21:23:23 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8OLNN1A040136; Fri, 24 Sep 2010 21:23:23 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201009242123.o8OLNN1A040136@svn.freebsd.org> From: Juli Mallett Date: Fri, 24 Sep 2010 21:23:23 +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: r213140 - head/sys/mips/cavium 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: Fri, 24 Sep 2010 21:23:23 -0000 Author: jmallett Date: Fri Sep 24 21:23:23 2010 New Revision: 213140 URL: http://svn.freebsd.org/changeset/base/213140 Log: Make the vast majority of Simple Executive files standard. Perhaps some of these could be made dependent on either of the octusb or octe options, but making them standard fixes a number of option combinations that were previously broken. Modified: head/sys/mips/cavium/files.octeon1 Modified: head/sys/mips/cavium/files.octeon1 ============================================================================== --- head/sys/mips/cavium/files.octeon1 Fri Sep 24 20:08:59 2010 (r213139) +++ head/sys/mips/cavium/files.octeon1 Fri Sep 24 21:23:23 2010 (r213140) @@ -39,30 +39,29 @@ mips/cavium/octopci_bus_space.c option mips/cavium/usb/octusb.c optional usb octusb mips/cavium/usb/octusb_octeon.c optional usb octusb -contrib/octeon-sdk/cvmx-cmd-queue.c optional octe -contrib/octeon-sdk/cvmx-fpa.c optional octe -contrib/octeon-sdk/cvmx-helper.c optional octe -contrib/octeon-sdk/cvmx-helper-board.c optional octe -contrib/octeon-sdk/cvmx-helper-errata.c optional octe -contrib/octeon-sdk/cvmx-helper-fpa.c optional octe -contrib/octeon-sdk/cvmx-helper-loop.c optional octe -contrib/octeon-sdk/cvmx-helper-npi.c optional octe -contrib/octeon-sdk/cvmx-helper-rgmii.c optional octe -contrib/octeon-sdk/cvmx-helper-sgmii.c optional octe -contrib/octeon-sdk/cvmx-helper-spi.c optional octe -contrib/octeon-sdk/cvmx-helper-util.c optional octe -contrib/octeon-sdk/cvmx-helper-xaui.c optional octe -contrib/octeon-sdk/cvmx-pko.c optional octe -contrib/octeon-sdk/cvmx-spi.c optional octe -contrib/octeon-sdk/cvmx-spi4000.c optional octe -contrib/octeon-sdk/cvmx-twsi.c optional octe - contrib/octeon-sdk/cvmx-usb.c optional octusb # XXX Some files could be excluded in some configurations. Making them # optional but on in the default config would seem reasonable. +contrib/octeon-sdk/cvmx-cmd-queue.c standard contrib/octeon-sdk/cvmx-bootmem.c standard +contrib/octeon-sdk/cvmx-fpa.c standard +contrib/octeon-sdk/cvmx-helper.c standard +contrib/octeon-sdk/cvmx-helper-board.c standard +contrib/octeon-sdk/cvmx-helper-errata.c standard +contrib/octeon-sdk/cvmx-helper-fpa.c standard +contrib/octeon-sdk/cvmx-helper-loop.c standard +contrib/octeon-sdk/cvmx-helper-npi.c standard +contrib/octeon-sdk/cvmx-helper-rgmii.c standard +contrib/octeon-sdk/cvmx-helper-sgmii.c standard +contrib/octeon-sdk/cvmx-helper-spi.c standard +contrib/octeon-sdk/cvmx-helper-util.c standard +contrib/octeon-sdk/cvmx-helper-xaui.c standard +contrib/octeon-sdk/cvmx-pko.c standard +contrib/octeon-sdk/cvmx-spi.c standard +contrib/octeon-sdk/cvmx-spi4000.c standard contrib/octeon-sdk/cvmx-sysinfo.c standard contrib/octeon-sdk/cvmx-thunder.c standard +contrib/octeon-sdk/cvmx-twsi.c standard contrib/octeon-sdk/cvmx-warn.c standard contrib/octeon-sdk/octeon-model.c standard