From owner-svn-src-projects@FreeBSD.ORG Sun Jun 14 03:44:43 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D2971065670; Sun, 14 Jun 2009 03:44:43 +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 7BF568FC17; Sun, 14 Jun 2009 03:44:43 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5E3ihWf033948; Sun, 14 Jun 2009 03:44:43 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5E3ihNS033945; Sun, 14 Jun 2009 03:44:43 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200906140344.n5E3ihNS033945@svn.freebsd.org> From: Warner Losh Date: Sun, 14 Jun 2009 03:44:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r194148 - in projects/mips/sys/mips: conf octeon1 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jun 2009 03:44:43 -0000 Author: imp Date: Sun Jun 14 03:44:43 2009 New Revision: 194148 URL: http://svn.freebsd.org/changeset/base/194148 Log: Actually rename the files this time. Also, start to fix OCTEON1 so it can configure. Added: projects/mips/sys/mips/octeon1/files.octeon1 (contents, props changed) - copied, changed from r194143, projects/mips/sys/mips/octeon1/files.octeon32 projects/mips/sys/mips/octeon1/std.octeon1 (contents, props changed) - copied, changed from r194143, projects/mips/sys/mips/octeon1/std.octeon32 Deleted: projects/mips/sys/mips/octeon1/files.octeon32 projects/mips/sys/mips/octeon1/std.octeon32 Modified: projects/mips/sys/mips/conf/OCTEON1 Modified: projects/mips/sys/mips/conf/OCTEON1 ============================================================================== --- projects/mips/sys/mips/conf/OCTEON1 Sun Jun 14 03:44:01 2009 (r194147) +++ projects/mips/sys/mips/conf/OCTEON1 Sun Jun 14 03:44:43 2009 (r194148) @@ -58,13 +58,12 @@ options INVARIANT_SUPPORT #Extra sanity #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device genclock +#XXXimp device genclock device loop device ether device md device uart -device uart_oct16550 -nodevice uart_8250 +nodevice uart_ns8250 device rgmii #options VERBOSE_SYSINIT Copied and modified: projects/mips/sys/mips/octeon1/files.octeon1 (from r194143, projects/mips/sys/mips/octeon1/files.octeon32) ============================================================================== --- projects/mips/sys/mips/octeon1/files.octeon32 Sun Jun 14 03:01:39 2009 (r194143, copy source) +++ projects/mips/sys/mips/octeon1/files.octeon1 Sun Jun 14 03:44:43 2009 (r194148) @@ -5,12 +5,12 @@ # $FreeBSD$ # Octeon Support Files # -mips/mips4k/octeon32/obio.c optional uart -mips/mips4k/octeon32/uart_cpu_octeonusart.c optional uart -mips/mips4k/octeon32/uart_bus_octeonusart.c optional uart +mips/octeon1/obio.c optional uart +mips/octeon1/uart_cpu_octeonusart.c optional uart +mips/octeon1/uart_bus_octeonusart.c optional uart dev/uart/uart_dev_oct16550.c optional uart mips/mips/mp_machdep.c optional smp -mips/mips4k/octeon32/octeon_machdep.c standard +mips/octeon1/octeon_machdep.c standard dev/flash/octeon_ebt3000_cf.c optional cf Copied and modified: projects/mips/sys/mips/octeon1/std.octeon1 (from r194143, projects/mips/sys/mips/octeon1/std.octeon32) ============================================================================== --- projects/mips/sys/mips/octeon1/std.octeon32 Sun Jun 14 03:01:39 2009 (r194143, copy source) +++ projects/mips/sys/mips/octeon1/std.octeon1 Sun Jun 14 03:44:43 2009 (r194148) @@ -4,8 +4,7 @@ # */ # $FreeBSD$ # -include "../mips4k/std.mips4k" -files "../mips4k/octeon32/files.octeon32" +files "../octeon1/files.octeon1" # #