From owner-svn-src-projects@FreeBSD.ORG Mon Nov 23 07:11:11 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 44C341065672;
Mon, 23 Nov 2009 07:11:11 +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 342B78FC0C;
Mon, 23 Nov 2009 07:11:11 +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 nAN7BAUM043641;
Mon, 23 Nov 2009 07:11:10 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAN7BAWb043637;
Mon, 23 Nov 2009 07:11:10 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911230711.nAN7BAWb043637@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 23 Nov 2009 07:11:10 +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: r199693 - projects/mips/sys/conf
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Nov 2009 07:11:11 -0000
Author: imp
Date: Mon Nov 23 07:11:10 2009
New Revision: 199693
URL: http://svn.freebsd.org/changeset/base/199693
Log:
Linker scripts for octeon1 kernels of various flavors.
Added:
projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32
projects/mips/sys/conf/ldscript.mips.octeon1.kernel.64
projects/mips/sys/conf/ldscript.mips.octeon1.kernel.n32
Added: projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32 Mon Nov 23 07:11:10 2009 (r199693)
@@ -0,0 +1,60 @@
+/*
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors."
+*/
+OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
+OUTPUT_ARCH(mips)
+ENTRY(_start)
+ __DYNAMIC = 0;
+PROVIDE (_DYNAMIC = 0);
+
+SECTIONS {
+
+ .text . : {
+ *(.text)
+ *(.dynamic)
+ etext = .;
+ _etext = .;
+ . = ALIGN(0x2000);
+ }
+
+ .rodata ALIGN(0x2000) : {
+ _fdata = .;
+ *(.rodata)
+ . = ALIGN(32);
+ }
+
+ .data . : {
+ _rwdata = .;
+ *(.data)
+ . = ALIGN(32);
+ CONSTRUCTORS;
+ }
+
+ _gp = (. + 0x8000);
+
+ .sdata . : {
+ _small_start = .;
+ *(.sdata)
+ . = ALIGN(32);
+ edata = .;
+ _edata = .;
+ }
+
+ .sbss . : {
+ __bss_start = .;
+ _fbss = .;
+ *(.sbss) *(.scommon)
+ _small_end = .;
+ . = ALIGN(32);
+ }
+
+ .bss . : {
+ *(.bss)
+ *(COMMON)
+ . = ALIGN(32);
+ _end = .;
+ end = .;
+ }
+
+}
Added: projects/mips/sys/conf/ldscript.mips.octeon1.kernel.64
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/mips/sys/conf/ldscript.mips.octeon1.kernel.64 Mon Nov 23 07:11:10 2009 (r199693)
@@ -0,0 +1,61 @@
+TARGET(elf64-tradbigmips)
+OUTPUT_FORMAT("elf64-tradbigmips", "elf64-tradbigmips", "elf64-tradlittlemips")
+OUTPUT_ARCH(mips)
+ENTRY(_start)
+/* __DYNAMIC = 0;
+PROVIDE (_DYNAMIC = 0);
+*/
+PHDRS {
+ text PT_LOAD FLAGS ( 5 ) ;
+}
+
+SECTIONS {
+
+ .text _start : {
+ *(.text)
+ /*(.dynamic)*/
+ etext = .;
+ _etext = .;
+ . = ALIGN(0x2000);
+ } : text
+
+ .rodata ALIGN(0x2000) : {
+ _fdata = .;
+ *(.rodata)
+ . = ALIGN(32);
+ }
+
+ .data . : {
+ _rwdata = .;
+ *(.data)
+ . = ALIGN(32);
+ CONSTRUCTORS;
+ }
+
+ _gp = (. + 0x8000);
+
+ .sdata . : {
+ _small_start = .;
+ *(.sdata)
+ . = ALIGN(32);
+ edata = .;
+ _edata = .;
+ }
+
+ .sbss . : {
+ __bss_start = .;
+ _fbss = .;
+ *(.sbss) *(.scommon)
+ _small_end = .;
+ . = ALIGN(32);
+ }
+
+ .bss . : {
+ *(.bss)
+ *(COMMON)
+ . = ALIGN(32);
+ _end = .;
+ end = .;
+ }
+
+}
Added: projects/mips/sys/conf/ldscript.mips.octeon1.kernel.n32
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/mips/sys/conf/ldscript.mips.octeon1.kernel.n32 Mon Nov 23 07:11:10 2009 (r199693)
@@ -0,0 +1,57 @@
+TARGET(elf32-ntradbigmips)
+OUTPUT_FORMAT("elf32-ntradbigmips", "elf32-ntradbigmips", "elf32-ntradlittlemips")
+OUTPUT_ARCH(mips)
+ENTRY(_start)
+ __DYNAMIC = 0;
+PROVIDE (_DYNAMIC = 0);
+
+SECTIONS {
+
+ .text . : {
+ *(.text)
+ *(.dynamic)
+ etext = .;
+ _etext = .;
+ . = ALIGN(0x2000);
+ }
+
+ .rodata ALIGN(0x2000) : {
+ _fdata = .;
+ *(.rodata)
+ . = ALIGN(32);
+ }
+
+ .data . : {
+ _rwdata = .;
+ *(.data)
+ . = ALIGN(32);
+ CONSTRUCTORS;
+ }
+
+ _gp = (. + 0x8000);
+
+ .sdata . : {
+ _small_start = .;
+ *(.sdata)
+ . = ALIGN(32);
+ edata = .;
+ _edata = .;
+ }
+
+ .sbss . : {
+ __bss_start = .;
+ _fbss = .;
+ *(.sbss) *(.scommon)
+ _small_end = .;
+ . = ALIGN(32);
+ }
+
+ .bss . : {
+ *(.bss)
+ *(COMMON)
+ . = ALIGN(32);
+ _end = .;
+ end = .;
+ }
+
+}
From owner-svn-src-projects@FreeBSD.ORG Mon Nov 23 07:49:22 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 7E340106566C;
Mon, 23 Nov 2009 07:49:22 +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 6E0768FC13;
Mon, 23 Nov 2009 07:49:22 +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 nAN7nMxh044401;
Mon, 23 Nov 2009 07:49:22 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAN7nMIe044399;
Mon, 23 Nov 2009 07:49:22 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911230749.nAN7nMIe044399@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 23 Nov 2009 07:49:22 +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: r199694 - projects/mips/sys/conf
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Nov 2009 07:49:22 -0000
Author: imp
Date: Mon Nov 23 07:49:22 2009
New Revision: 199694
URL: http://svn.freebsd.org/changeset/base/199694
Log:
Start linking at the kernel link address....
# this gets me a loading, but not working, kernel on octeon's simulator.
Modified:
projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32
Modified: projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32
==============================================================================
--- projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32 Mon Nov 23 07:11:10 2009 (r199693)
+++ projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32 Mon Nov 23 07:49:22 2009 (r199694)
@@ -5,11 +5,9 @@
OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
OUTPUT_ARCH(mips)
ENTRY(_start)
- __DYNAMIC = 0;
-PROVIDE (_DYNAMIC = 0);
SECTIONS {
-
+ . = KERNLOADADDR + SIZEOF_HEADERS;
.text . : {
*(.text)
*(.dynamic)
From owner-svn-src-projects@FreeBSD.ORG Mon Nov 23 07:49:50 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 9708D1065745;
Mon, 23 Nov 2009 07:49:50 +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 86FF38FC13;
Mon, 23 Nov 2009 07:49:50 +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 nAN7noqF044443;
Mon, 23 Nov 2009 07:49:50 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAN7nomk044441;
Mon, 23 Nov 2009 07:49:50 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911230749.nAN7nomk044441@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 23 Nov 2009 07:49:50 +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: r199695 - projects/mips/sys/mips/conf
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Nov 2009 07:49:50 -0000
Author: imp
Date: Mon Nov 23 07:49:50 2009
New Revision: 199695
URL: http://svn.freebsd.org/changeset/base/199695
Log:
Specify loader script and load address
Modified:
projects/mips/sys/mips/conf/OCTEON1-32
Modified: projects/mips/sys/mips/conf/OCTEON1-32
==============================================================================
--- projects/mips/sys/mips/conf/OCTEON1-32 Mon Nov 23 07:49:22 2009 (r199694)
+++ projects/mips/sys/mips/conf/OCTEON1-32 Mon Nov 23 07:49:50 2009 (r199695)
@@ -27,9 +27,11 @@ ident OCTEON1
# Don't build any modules yet.
makeoptions MODULES_OVERRIDE=""
makeoptions TARGET_BIG_ENDIAN=defined
+makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.kernel.32
#makeoptions TARGET_64BIT=defined
options KERNVIRTADDR=0x80100000
+makeoptions KERNLOADADDR=0x80100000
include "../octeon1/std.octeon1"
hints "OCTEON1.hints" #Default places to look for devices.
From owner-svn-src-projects@FreeBSD.ORG Mon Nov 23 15:26:17 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 50AED1065672;
Mon, 23 Nov 2009 15:26:17 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 402BE8FC15;
Mon, 23 Nov 2009 15:26:17 +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 nANFQH3L060864;
Mon, 23 Nov 2009 15:26:17 GMT
(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nANFQHcr060863;
Mon, 23 Nov 2009 15:26:17 GMT
(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911231526.nANFQHcr060863@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Mon, 23 Nov 2009 15:26:17 +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: r199713 -
projects/clangbsd/contrib/llvm/tools/clang/lib/Driver
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Nov 2009 15:26:17 -0000
Author: rdivacky
Date: Mon Nov 23 15:26:16 2009
New Revision: 199713
URL: http://svn.freebsd.org/changeset/base/199713
Log:
Turn off the warnings about unused compilation arguments.
Modified:
projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp
Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp Mon Nov 23 11:52:20 2009 (r199712)
+++ projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp Mon Nov 23 15:26:16 2009 (r199713)
@@ -950,7 +950,7 @@ void Driver::BuildJobs(Compilation &C) c
// If the user passed -Qunused-arguments or there were errors, don't warn
// about any unused arguments.
- if (Diags.getNumErrors() ||
+ if (1 || Diags.getNumErrors() ||
C.getArgs().hasArg(options::OPT_Qunused_arguments))
return;
From owner-svn-src-projects@FreeBSD.ORG Mon Nov 23 21:17:39 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 198AC106566B;
Mon, 23 Nov 2009 21:17:39 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 090BC8FC0A;
Mon, 23 Nov 2009 21:17:39 +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 nANLHcH3070607;
Mon, 23 Nov 2009 21:17:38 GMT
(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nANLHc5m070605;
Mon, 23 Nov 2009 21:17:38 GMT
(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911232117.nANLHc5m070605@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Mon, 23 Nov 2009 21:17:38 +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: r199720 - projects/clangbsd
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Nov 2009 21:17:39 -0000
Author: rdivacky
Date: Mon Nov 23 21:17:38 2009
New Revision: 199720
URL: http://svn.freebsd.org/changeset/base/199720
Log:
Add -L${WORLDTMP}/usr/lib/ to WMAKE so the right libs are picked up. I need
to fix lib32 build similarly.
Pointed out by: ru
Modified:
projects/clangbsd/Makefile.inc1
Modified: projects/clangbsd/Makefile.inc1
==============================================================================
--- projects/clangbsd/Makefile.inc1 Mon Nov 23 21:09:23 2009 (r199719)
+++ projects/clangbsd/Makefile.inc1 Mon Nov 23 21:17:38 2009 (r199720)
@@ -257,8 +257,8 @@ WMAKEENV= ${CROSSENV} \
VERSION="${VERSION}" \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH} \
- CC="${CC} -isystem ${WORLDTMP}/usr/include -B${WORLDTMP}" \
- CXX="${CXX} -isystem ${WORLDTMP}/include/c++/4.2 -isystem ${WORLDTMP}/include/c++/4.2/backward -B${WORLDTMP}"
+ CC="${CC} -isystem ${WORLDTMP}/usr/include -B${WORLDTMP} -L${WORLDTMP}/usr/lib/" \
+ CXX="${CXX} -isystem ${WORLDTMP}/include/c++/4.2 -isystem ${WORLDTMP}/include/c++/4.2/backward -B${WORLDTMP} -L${WORLDTMP}/usr/lib/"
.if ${MK_CDDL} == "no" || defined(NO_CTF)
WMAKEENV+= NO_CTF=1
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 07:40:38 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 86A1D106568B;
Tue, 24 Nov 2009 07:40:38 +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 74D628FC18;
Tue, 24 Nov 2009 07:40:38 +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 nAO7ecwk009360;
Tue, 24 Nov 2009 07:40:38 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAO7ecFa009358;
Tue, 24 Nov 2009 07:40:38 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911240740.nAO7ecFa009358@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 07:40:38 +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: r199736 - projects/mips/sys/mips/mips
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 07:40:38 -0000
Author: imp
Date: Tue Nov 24 07:40:38 2009
New Revision: 199736
URL: http://svn.freebsd.org/changeset/base/199736
Log:
Prefer ANSI spellings of uintXX_t, etc.
Modified:
projects/mips/sys/mips/mips/bus_space_generic.c
Modified: projects/mips/sys/mips/mips/bus_space_generic.c
==============================================================================
--- projects/mips/sys/mips/mips/bus_space_generic.c Tue Nov 24 07:18:38 2009 (r199735)
+++ projects/mips/sys/mips/mips/bus_space_generic.c Tue Nov 24 07:40:38 2009 (r199736)
@@ -247,7 +247,7 @@ generic_bs_subregion(void *t __unused, b
return (0);
}
-u_int8_t
+uint8_t
generic_bs_r_1(void *t, bus_space_handle_t handle,
bus_size_t offset)
{
@@ -255,7 +255,7 @@ generic_bs_r_1(void *t, bus_space_handle
return (rd8(handle + offset));
}
-u_int16_t
+uint16_t
generic_bs_r_2(void *t, bus_space_handle_t handle,
bus_size_t offset)
{
@@ -263,7 +263,7 @@ generic_bs_r_2(void *t, bus_space_handle
return (rd16(handle + offset));
}
-u_int32_t
+uint32_t
generic_bs_r_4(void *t, bus_space_handle_t handle,
bus_size_t offset)
{
@@ -274,7 +274,7 @@ generic_bs_r_4(void *t, bus_space_handle
void
generic_bs_rm_1(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int8_t *addr, size_t count)
+ bus_size_t offset, uint8_t *addr, size_t count)
{
while (count--)
@@ -283,7 +283,7 @@ generic_bs_rm_1(void *t, bus_space_handl
void
generic_bs_rm_2(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int16_t *addr, size_t count)
+ bus_size_t offset, uint16_t *addr, size_t count)
{
bus_addr_t baddr = bsh + offset;
@@ -293,7 +293,7 @@ generic_bs_rm_2(void *t, bus_space_handl
void
generic_bs_rm_4(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int32_t *addr, size_t count)
+ bus_size_t offset, uint32_t *addr, size_t count)
{
bus_addr_t baddr = bsh + offset;
@@ -309,7 +309,7 @@ generic_bs_rm_4(void *t, bus_space_handl
*/
void
generic_bs_rr_1(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int8_t *addr, size_t count)
+ bus_size_t offset, uint8_t *addr, size_t count)
{
bus_addr_t baddr = bsh + offset;
@@ -321,7 +321,7 @@ generic_bs_rr_1(void *t, bus_space_handl
void
generic_bs_rr_2(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int16_t *addr, size_t count)
+ bus_size_t offset, uint16_t *addr, size_t count)
{
bus_addr_t baddr = bsh + offset;
@@ -333,7 +333,7 @@ generic_bs_rr_2(void *t, bus_space_handl
void
generic_bs_rr_4(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int32_t *addr, size_t count)
+ bus_size_t offset, uint32_t *addr, size_t count)
{
bus_addr_t baddr = bsh + offset;
@@ -349,7 +349,7 @@ generic_bs_rr_4(void *t, bus_space_handl
*/
void
generic_bs_w_1(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int8_t value)
+ bus_size_t offset, uint8_t value)
{
wr8(bsh + offset, value);
@@ -357,7 +357,7 @@ generic_bs_w_1(void *t, bus_space_handle
void
generic_bs_w_2(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int16_t value)
+ bus_size_t offset, uint16_t value)
{
wr16(bsh + offset, value);
@@ -365,7 +365,7 @@ generic_bs_w_2(void *t, bus_space_handle
void
generic_bs_w_4(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int32_t value)
+ bus_size_t offset, uint32_t value)
{
wr32(bsh + offset, value);
@@ -377,7 +377,7 @@ generic_bs_w_4(void *t, bus_space_handle
*/
void
generic_bs_wm_1(void *t, bus_space_handle_t bsh,
- bus_size_t offset, const u_int8_t *addr, size_t count)
+ bus_size_t offset, const uint8_t *addr, size_t count)
{
bus_addr_t baddr = bsh + offset;
@@ -387,7 +387,7 @@ generic_bs_wm_1(void *t, bus_space_handl
void
generic_bs_wm_2(void *t, bus_space_handle_t bsh,
- bus_size_t offset, const u_int16_t *addr, size_t count)
+ bus_size_t offset, const uint16_t *addr, size_t count)
{
bus_addr_t baddr = bsh + offset;
@@ -397,7 +397,7 @@ generic_bs_wm_2(void *t, bus_space_handl
void
generic_bs_wm_4(void *t, bus_space_handle_t bsh,
- bus_size_t offset, const u_int32_t *addr, size_t count)
+ bus_size_t offset, const uint32_t *addr, size_t count)
{
bus_addr_t baddr = bsh + offset;
@@ -411,7 +411,7 @@ generic_bs_wm_4(void *t, bus_space_handl
*/
void
generic_bs_wr_1(void *t, bus_space_handle_t bsh,
- bus_size_t offset, const u_int8_t *addr, size_t count)
+ bus_size_t offset, const uint8_t *addr, size_t count)
{
bus_addr_t baddr = bsh + offset;
@@ -423,7 +423,7 @@ generic_bs_wr_1(void *t, bus_space_handl
void
generic_bs_wr_2(void *t, bus_space_handle_t bsh,
- bus_size_t offset, const u_int16_t *addr, size_t count)
+ bus_size_t offset, const uint16_t *addr, size_t count)
{
bus_addr_t baddr = bsh + offset;
@@ -435,7 +435,7 @@ generic_bs_wr_2(void *t, bus_space_handl
void
generic_bs_wr_4(void *t, bus_space_handle_t bsh,
- bus_size_t offset, const u_int32_t *addr, size_t count)
+ bus_size_t offset, const uint32_t *addr, size_t count)
{
bus_addr_t baddr = bsh + offset;
@@ -451,7 +451,7 @@ generic_bs_wr_4(void *t, bus_space_handl
*/
void
generic_bs_sm_1(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int8_t value, size_t count)
+ bus_size_t offset, uint8_t value, size_t count)
{
bus_addr_t addr = bsh + offset;
@@ -461,7 +461,7 @@ generic_bs_sm_1(void *t, bus_space_handl
void
generic_bs_sm_2(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int16_t value, size_t count)
+ bus_size_t offset, uint16_t value, size_t count)
{
bus_addr_t addr = bsh + offset;
@@ -471,7 +471,7 @@ generic_bs_sm_2(void *t, bus_space_handl
void
generic_bs_sm_4(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int32_t value, size_t count)
+ bus_size_t offset, uint32_t value, size_t count)
{
bus_addr_t addr = bsh + offset;
@@ -485,7 +485,7 @@ generic_bs_sm_4(void *t, bus_space_handl
*/
void
generic_bs_sr_1(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int8_t value, size_t count)
+ bus_size_t offset, uint8_t value, size_t count)
{
bus_addr_t addr = bsh + offset;
@@ -495,7 +495,7 @@ generic_bs_sr_1(void *t, bus_space_handl
void
generic_bs_sr_2(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int16_t value, size_t count)
+ bus_size_t offset, uint16_t value, size_t count)
{
bus_addr_t addr = bsh + offset;
@@ -505,7 +505,7 @@ generic_bs_sr_2(void *t, bus_space_handl
void
generic_bs_sr_4(void *t, bus_space_handle_t bsh,
- bus_size_t offset, u_int32_t value, size_t count)
+ bus_size_t offset, uint32_t value, size_t count)
{
bus_addr_t addr = bsh + offset;
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 07:41:16 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 0758C10656A8;
Tue, 24 Nov 2009 07:41:16 +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 EB0D88FC28;
Tue, 24 Nov 2009 07:41:15 +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 nAO7fFdg009409;
Tue, 24 Nov 2009 07:41:15 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAO7fF8r009407;
Tue, 24 Nov 2009 07:41:15 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911240741.nAO7fF8r009407@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 07:41:15 +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: r199737 - projects/mips/sys/mips/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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 07:41:16 -0000
Author: imp
Date: Tue Nov 24 07:41:15 2009
New Revision: 199737
URL: http://svn.freebsd.org/changeset/base/199737
Log:
Add size of octeon uart registers to map.
Modified:
projects/mips/sys/mips/octeon1/octeonreg.h
Modified: projects/mips/sys/mips/octeon1/octeonreg.h
==============================================================================
--- projects/mips/sys/mips/octeon1/octeonreg.h Tue Nov 24 07:40:38 2009 (r199736)
+++ projects/mips/sys/mips/octeon1/octeonreg.h Tue Nov 24 07:41:15 2009 (r199737)
@@ -197,6 +197,7 @@
#define OCTEON_UART0ADR 0x8001180000000800ull
#define OCTEON_UART1ADR 0x8001180000000C00ull
+#define OCTEON_UART_SIZE 0x400
#define OCTEON_MIO_BOOT_BIST_STAT 0x80011800000000F8ull
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 07:50:20 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 7C9221065672;
Tue, 24 Nov 2009 07:50:20 +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 6AEEB8FC13;
Tue, 24 Nov 2009 07:50:20 +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 nAO7oKMG009623;
Tue, 24 Nov 2009 07:50:20 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAO7oK13009620;
Tue, 24 Nov 2009 07:50:20 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911240750.nAO7oK13009620@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 07:50:20 +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: r199738 - projects/mips/sys/mips/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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 07:50:20 -0000
Author: imp
Date: Tue Nov 24 07:50:19 2009
New Revision: 199738
URL: http://svn.freebsd.org/changeset/base/199738
Log:
Rewrite to try to be more sane:
o Introduce a uart bus space so that we don't have to hack dev/uart to do 8
byte reads. This also handles the shift properly, so reset the shift we
want dev/uart doing to 0. In effect, this bus space makes the octeon
registers have an interface to dev/uart that looks just like the old ISA
bus, but does the necessary 64-bit read/write to the bus. We only support
read/write operations. We do all the widths, but likely could get away
with only 64-bit and 8-bit given the restricted nature of use of this bus.
o use bus_space_map to set the .bsh rather than a direct assignment.
o Minor cleanup of uart_cpu_getdev to make it conform more to the other
implementations.
o Add some coments for future work.
# with these changes, we now make it through cninit, but there's still some
# problem that's preventing output, as well as another problem that causes
# us to call panic just after we return from cninit() in platform_start.
Modified:
projects/mips/sys/mips/octeon1/uart_bus_octeonusart.c
projects/mips/sys/mips/octeon1/uart_cpu_octeonusart.c
Modified: projects/mips/sys/mips/octeon1/uart_bus_octeonusart.c
==============================================================================
--- projects/mips/sys/mips/octeon1/uart_bus_octeonusart.c Tue Nov 24 07:41:15 2009 (r199737)
+++ projects/mips/sys/mips/octeon1/uart_bus_octeonusart.c Tue Nov 24 07:50:19 2009 (r199738)
@@ -92,23 +92,23 @@ uart_octeon_probe(device_t dev)
struct uart_softc *sc;
int unit;
-/*
- * Note that both tty0 & tty1 are viable consoles. We add child devices
- * such that ttyu0 ends up front of queue.
- */
unit = device_get_unit(dev);
sc = device_get_softc(dev);
- sc->sc_sysdev = NULL;
+ sc->sc_class = &uart_oct16550_class;
+
+#if 1
+ /*
+ * We inherit the settings from the systme console. Note, the bst
+ * bad bus_space_map are bogus here, but obio doesn't yet support
+ * them, it seems.
+ */
sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs);
bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas));
- if (!unit) {
- sc->sc_sysdev->bas.bst = 0;
- sc->sc_sysdev->bas.bsh = OCTEON_UART0ADR;
- }
- sc->sc_class = &uart_oct16550_class;
- sc->sc_bas.bst = 0;
- sc->sc_bas.bsh = unit ? OCTEON_UART1ADR : OCTEON_UART0ADR;
- sc->sc_bas.regshft = 0x3;
+ sc->sc_bas.bst = uart_bus_space_mem;
+ if (bus_space_map(sc->sc_bas.bst, OCTEON_UART0ADR, OCTEON_UART_SIZE,
+ 0, &sc->sc_bas.bsh) != 0)
+ return (ENXIO);
+#endif
return (uart_bus_probe(dev, sc->sc_bas.regshft, 0, 0, unit));
}
@@ -118,6 +118,4 @@ octeon_uart_identify(driver_t * drv, dev
BUS_ADD_CHILD(parent, 0, "uart", 0);
}
-
-
DRIVER_MODULE(uart, obio, uart_octeon_driver, uart_devclass, 0, 0);
Modified: projects/mips/sys/mips/octeon1/uart_cpu_octeonusart.c
==============================================================================
--- projects/mips/sys/mips/octeon1/uart_cpu_octeonusart.c Tue Nov 24 07:41:15 2009 (r199737)
+++ projects/mips/sys/mips/octeon1/uart_cpu_octeonusart.c Tue Nov 24 07:50:19 2009 (r199738)
@@ -1,4 +1,5 @@
/*-
+ * Copyright (c) 2009 M. Warner Losh <imp@FreeBSD.org>
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
@@ -25,14 +26,6 @@
*
* $Id$
*/
-/*
- * Skeleton of this file was based on respective code for ARM
- * code written by Olivier Houchard.
- */
-/*
- * XXXMIPS: This file is hacked from arm/... . XXXMIPS here means this file is
- * experimental and was written for MIPS32 port.
- */
#include "opt_uart.h"
#include <sys/cdefs.h>
@@ -49,42 +42,150 @@ __FBSDID("$FreeBSD$");
#include <dev/uart/uart_cpu.h>
#include <mips/octeon1/octeonreg.h>
+#include <mips/octeon1/octeon_pcmap_regs.h>
bus_space_tag_t uart_bus_space_io;
bus_space_tag_t uart_bus_space_mem;
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/ktr.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_extern.h>
+
+#include <machine/bus.h>
+#include <machine/cache.h>
+
+/*
+ * Specailized uart bus space. We present a 1 apart byte oriented
+ * bus to the outside world, but internally translate to/from the 8-apart
+ * 64-bit word bus that's on the octeon. We only support simple read/write
+ * in this space. Everything else is undefined.
+ */
+
+static uint8_t
+ou_bs_r_1(void *t, bus_space_handle_t handle, bus_size_t offset)
+{
+
+ return (oct_read64(handle + (offset << 3)));
+}
+
+static uint16_t
+ou_bs_r_2(void *t, bus_space_handle_t handle, bus_size_t offset)
+{
+
+ return (oct_read64(handle + (offset << 3)));
+}
+
+static uint32_t
+ou_bs_r_4(void *t, bus_space_handle_t handle, bus_size_t offset)
+{
+
+ return (oct_read64(handle + (offset << 3)));
+}
+
+static uint64_t
+ou_bs_r_8(void *t, bus_space_handle_t handle, bus_size_t offset)
+{
+
+ return (oct_read64(handle + (offset << 3)));
+}
+
+static void
+ou_bs_w_1(void *t, bus_space_handle_t bsh, bus_size_t offset, uint8_t value)
+{
+
+ oct_write64(bsh + (offset << 3), value);
+}
+
+static void
+ou_bs_w_2(void *t, bus_space_handle_t bsh, bus_size_t offset, uint16_t value)
+{
+
+ oct_write64(bsh + (offset << 3), value);
+}
+
+static void
+ou_bs_w_4(void *t, bus_space_handle_t bsh, bus_size_t offset, uint32_t value)
+{
+
+ oct_write64(bsh + (offset << 3), value);
+}
+
+static void
+ou_bs_w_8(void *t, bus_space_handle_t bsh, bus_size_t offset, uint64_t value)
+{
+
+ oct_write64(bsh + (offset << 3), value);
+}
+
+static struct bus_space octeon_uart_tag = {
+ .bs_map = generic_bs_map,
+ .bs_unmap = generic_bs_unmap,
+ .bs_subregion = generic_bs_subregion,
+ .bs_barrier = generic_bs_barrier,
+ .bs_r_1 = ou_bs_r_1,
+ .bs_r_2 = ou_bs_r_2,
+ .bs_r_4 = ou_bs_r_4,
+ .bs_r_8 = ou_bs_r_8,
+ .bs_w_1 = ou_bs_w_1,
+ .bs_w_2 = ou_bs_w_2,
+ .bs_w_4 = ou_bs_w_4,
+ .bs_w_8 = ou_bs_w_8,
+};
+
extern struct uart_class uart_oct16550_class;
-extern struct uart_ops octeon_usart_ops;
-extern struct bus_space octeon_bs_tag;
int
uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
{
+
return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0);
- return (0);
}
int
uart_cpu_getdev(int devtype, struct uart_devinfo *di)
{
- struct uart_class *class;
+ struct uart_class *class = &uart_oct16550_class;
- class = &uart_oct16550_class;
+ /*
+ * These fields need to be setup corretly for uart_getenv to
+ * work in all cases.
+ */
+ uart_bus_space_io = NULL; /* No io map for this device */
+ uart_bus_space_mem = &octeon_uart_tag;
+ di->bas.bst = uart_bus_space_mem;
+
+ /*
+ * If env specification for UART exists it takes precedence:
+ * hw.uart.console="mm:0xf1012000" or similar
+ */
+ if (uart_getenv(devtype, di, class) == 0)
+ return (0);
+
+ /*
+ * Fallback to UART0 for console.
+ */
di->ops = uart_getops(class);
- di->bas.bst = 0;
di->bas.chan = 0;
- di->bas.regshft = 3; /* Each UART reg is 8 byte addresss apart. 1
- * << 3 */
+ if (bus_space_map(di->bas.bst, OCTEON_UART0ADR, OCTEON_UART_SIZE,
+ 0, &di->bas.bsh) != 0)
+ return (ENXIO);
+ di->bas.regshft = 0;
di->bas.rclk = 0;
di->baudrate = 115200;
di->databits = 8;
di->stopbits = 1;
di->parity = UART_PARITY_NONE;
- di->bas.bsh = OCTEON_UART0ADR;
- uart_getenv(devtype, di, class);
-
- uart_bus_space_io = NULL;
- uart_bus_space_mem = mips_bus_space_generic;
return (0);
}
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 08:21:24 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 141D6106566B;
Tue, 24 Nov 2009 08:21:24 +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 034FB8FC17;
Tue, 24 Nov 2009 08:21:24 +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 nAO8LNX5010408;
Tue, 24 Nov 2009 08:21:23 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAO8LNpe010406;
Tue, 24 Nov 2009 08:21:23 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911240821.nAO8LNpe010406@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 08:21:23 +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: r199740 - projects/mips/sys/mips/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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 08:21:24 -0000
Author: imp
Date: Tue Nov 24 08:21:23 2009
New Revision: 199740
URL: http://svn.freebsd.org/changeset/base/199740
Log:
remove bogus panic.
Don't use fortran style line control.
Modified:
projects/mips/sys/mips/octeon1/octeon_machdep.c
Modified: projects/mips/sys/mips/octeon1/octeon_machdep.c
==============================================================================
--- projects/mips/sys/mips/octeon1/octeon_machdep.c Tue Nov 24 08:14:22 2009 (r199739)
+++ projects/mips/sys/mips/octeon1/octeon_machdep.c Tue Nov 24 08:21:23 2009 (r199740)
@@ -682,7 +682,7 @@ platform_start(__register_t a0, __regist
memset(&edata, 0, kernend - (vm_offset_t)(&edata));
octeon_ciu_reset();
- octeon_uart_write_string(0, "\nPlatform Starting");
+ octeon_uart_write_string(0, "Platform Starting\n");
/* From here on down likely is bogus */
/*
@@ -722,9 +722,12 @@ platform_start(__register_t a0, __regist
platform_counter_freq = 330000000UL; /* XXX: from idt */
mips_timer_init_params(platform_counter_freq, 1);
cninit();
+ printf("Now is the time to get happy!\n");
/* Panic here, after cninit */
+#if 0
if (mem == 0)
panic("No mem=XX parameter in arguments");
+#endif
printf("cmd line: ");
for (i=0; i < argc; i++)
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 08:21:48 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 E415D1065676;
Tue, 24 Nov 2009 08:21:48 +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 BA2298FC17;
Tue, 24 Nov 2009 08:21:48 +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 nAO8Lmvi010450;
Tue, 24 Nov 2009 08:21:48 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAO8Lmmv010448;
Tue, 24 Nov 2009 08:21:48 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911240821.nAO8Lmmv010448@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 08:21:48 +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: r199741 - projects/mips/sys/mips/mips
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 08:21:49 -0000
Author: imp
Date: Tue Nov 24 08:21:48 2009
New Revision: 199741
URL: http://svn.freebsd.org/changeset/base/199741
Log:
TARGET_OCTEON reqiures opt_cputype.h.
Modified:
projects/mips/sys/mips/mips/cache.c
Modified: projects/mips/sys/mips/mips/cache.c
==============================================================================
--- projects/mips/sys/mips/mips/cache.c Tue Nov 24 08:21:23 2009 (r199740)
+++ projects/mips/sys/mips/mips/cache.c Tue Nov 24 08:21:48 2009 (r199741)
@@ -76,6 +76,8 @@ __FBSDID("$FreeBSD$");
#include <machine/cpuinfo.h>
#include <machine/cache.h>
+#include "opt_cputype.h"
+
struct mips_cache_ops mips_cache_ops;
void
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 08:35:11 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 C66C21065672;
Tue, 24 Nov 2009 08:35:11 +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 B55878FC0A;
Tue, 24 Nov 2009 08:35:11 +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 nAO8ZBEP010774;
Tue, 24 Nov 2009 08:35:11 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAO8ZB4v010772;
Tue, 24 Nov 2009 08:35:11 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911240835.nAO8ZB4v010772@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 08:35:11 +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: r199742 - projects/mips/sys/mips/mips
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 08:35:11 -0000
Author: imp
Date: Tue Nov 24 08:35:11 2009
New Revision: 199742
URL: http://svn.freebsd.org/changeset/base/199742
Log:
Move the hard-wiring of the dcache on octeon outside of the if
statement. When no caches support was added, it looks like
TARGET_OCTEON was bogusly moved inside the if. Also, include
opt_cputype.h to make TARGET_OCTEON actually active.
# now we die in pmap init somewhere... Most likely because 32MB of RAM is
# too tight given the load address we're using.
Modified:
projects/mips/sys/mips/mips/cpu.c
Modified: projects/mips/sys/mips/mips/cpu.c
==============================================================================
--- projects/mips/sys/mips/mips/cpu.c Tue Nov 24 08:21:48 2009 (r199741)
+++ projects/mips/sys/mips/mips/cpu.c Tue Nov 24 08:35:11 2009 (r199742)
@@ -49,6 +49,8 @@ __FBSDID("$FreeBSD$");
#include <machine/pte.h>
#include <machine/hwfunc.h>
+#include "opt_cputype.h"
+
static struct mips_cpuinfo cpuinfo;
union cpuprid cpu_id;
@@ -113,18 +115,18 @@ mips_get_identity(struct mips_cpuinfo *c
(((cfg1 & MIPS_CONFIG1_DA_MASK) >> MIPS_CONFIG1_DA_SHIFT)) + 1;
cpuinfo->l1.dc_nsets =
1 << (((cfg1 & MIPS_CONFIG1_DS_MASK) >> MIPS_CONFIG1_DS_SHIFT) + 6);
+ }
#ifdef TARGET_OCTEON
- /*
- * Octeon does 128 byte line-size. But Config-Sel1 doesn't show
- * 128 line-size, 1 Set, 64 ways.
- */
- cpuinfo->l1.dc_linesize = 128;
- cpuinfo->l1.dc_nsets = 1;
- cpuinfo->l1.dc_nways = 64;
+ /*
+ * Octeon does 128 byte line-size. But Config-Sel1 doesn't show
+ * 128 line-size, 1 Set, 64 ways.
+ */
+ cpuinfo->l1.dc_linesize = 128;
+ cpuinfo->l1.dc_nsets = 1;
+ cpuinfo->l1.dc_nways = 64;
#endif
- cpuinfo->l1.dc_size = cpuinfo->l1.dc_linesize
- * cpuinfo->l1.dc_nsets * cpuinfo->l1.dc_nways;
- }
+ cpuinfo->l1.dc_size = cpuinfo->l1.dc_linesize
+ * cpuinfo->l1.dc_nsets * cpuinfo->l1.dc_nways;
}
void
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 14:57:50 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 8D92A1065672;
Tue, 24 Nov 2009 14:57:50 +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 7C1E48FC18;
Tue, 24 Nov 2009 14:57:50 +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 nAOEvoeX020178;
Tue, 24 Nov 2009 14:57:50 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOEvogN020173;
Tue, 24 Nov 2009 14:57:50 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911241457.nAOEvogN020173@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 14:57:50 +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: r199751 - in projects/mips/sys: conf mips/conf
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 14:57:50 -0000
Author: imp
Date: Tue Nov 24 14:57:50 2009
New Revision: 199751
URL: http://svn.freebsd.org/changeset/base/199751
Log:
Get rid of redundant .kernel in these names.
Added:
projects/mips/sys/conf/ldscript.mips.octeon1.32
- copied unchanged from r199694, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32
projects/mips/sys/conf/ldscript.mips.octeon1.64
- copied unchanged from r199693, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.64
projects/mips/sys/conf/ldscript.mips.octeon1.n32
- copied unchanged from r199693, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.n32
Deleted:
projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32
projects/mips/sys/conf/ldscript.mips.octeon1.kernel.64
projects/mips/sys/conf/ldscript.mips.octeon1.kernel.n32
Modified:
projects/mips/sys/mips/conf/OCTEON1
projects/mips/sys/mips/conf/OCTEON1-32
Copied: projects/mips/sys/conf/ldscript.mips.octeon1.32 (from r199694, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/mips/sys/conf/ldscript.mips.octeon1.32 Tue Nov 24 14:57:50 2009 (r199751, copy of r199694, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.32)
@@ -0,0 +1,58 @@
+/*
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors."
+*/
+OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
+OUTPUT_ARCH(mips)
+ENTRY(_start)
+
+SECTIONS {
+ . = KERNLOADADDR + SIZEOF_HEADERS;
+ .text . : {
+ *(.text)
+ *(.dynamic)
+ etext = .;
+ _etext = .;
+ . = ALIGN(0x2000);
+ }
+
+ .rodata ALIGN(0x2000) : {
+ _fdata = .;
+ *(.rodata)
+ . = ALIGN(32);
+ }
+
+ .data . : {
+ _rwdata = .;
+ *(.data)
+ . = ALIGN(32);
+ CONSTRUCTORS;
+ }
+
+ _gp = (. + 0x8000);
+
+ .sdata . : {
+ _small_start = .;
+ *(.sdata)
+ . = ALIGN(32);
+ edata = .;
+ _edata = .;
+ }
+
+ .sbss . : {
+ __bss_start = .;
+ _fbss = .;
+ *(.sbss) *(.scommon)
+ _small_end = .;
+ . = ALIGN(32);
+ }
+
+ .bss . : {
+ *(.bss)
+ *(COMMON)
+ . = ALIGN(32);
+ _end = .;
+ end = .;
+ }
+
+}
Copied: projects/mips/sys/conf/ldscript.mips.octeon1.64 (from r199693, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.64)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/mips/sys/conf/ldscript.mips.octeon1.64 Tue Nov 24 14:57:50 2009 (r199751, copy of r199693, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.64)
@@ -0,0 +1,61 @@
+TARGET(elf64-tradbigmips)
+OUTPUT_FORMAT("elf64-tradbigmips", "elf64-tradbigmips", "elf64-tradlittlemips")
+OUTPUT_ARCH(mips)
+ENTRY(_start)
+/* __DYNAMIC = 0;
+PROVIDE (_DYNAMIC = 0);
+*/
+PHDRS {
+ text PT_LOAD FLAGS ( 5 ) ;
+}
+
+SECTIONS {
+
+ .text _start : {
+ *(.text)
+ /*(.dynamic)*/
+ etext = .;
+ _etext = .;
+ . = ALIGN(0x2000);
+ } : text
+
+ .rodata ALIGN(0x2000) : {
+ _fdata = .;
+ *(.rodata)
+ . = ALIGN(32);
+ }
+
+ .data . : {
+ _rwdata = .;
+ *(.data)
+ . = ALIGN(32);
+ CONSTRUCTORS;
+ }
+
+ _gp = (. + 0x8000);
+
+ .sdata . : {
+ _small_start = .;
+ *(.sdata)
+ . = ALIGN(32);
+ edata = .;
+ _edata = .;
+ }
+
+ .sbss . : {
+ __bss_start = .;
+ _fbss = .;
+ *(.sbss) *(.scommon)
+ _small_end = .;
+ . = ALIGN(32);
+ }
+
+ .bss . : {
+ *(.bss)
+ *(COMMON)
+ . = ALIGN(32);
+ _end = .;
+ end = .;
+ }
+
+}
Copied: projects/mips/sys/conf/ldscript.mips.octeon1.n32 (from r199693, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.n32)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/mips/sys/conf/ldscript.mips.octeon1.n32 Tue Nov 24 14:57:50 2009 (r199751, copy of r199693, projects/mips/sys/conf/ldscript.mips.octeon1.kernel.n32)
@@ -0,0 +1,57 @@
+TARGET(elf32-ntradbigmips)
+OUTPUT_FORMAT("elf32-ntradbigmips", "elf32-ntradbigmips", "elf32-ntradlittlemips")
+OUTPUT_ARCH(mips)
+ENTRY(_start)
+ __DYNAMIC = 0;
+PROVIDE (_DYNAMIC = 0);
+
+SECTIONS {
+
+ .text . : {
+ *(.text)
+ *(.dynamic)
+ etext = .;
+ _etext = .;
+ . = ALIGN(0x2000);
+ }
+
+ .rodata ALIGN(0x2000) : {
+ _fdata = .;
+ *(.rodata)
+ . = ALIGN(32);
+ }
+
+ .data . : {
+ _rwdata = .;
+ *(.data)
+ . = ALIGN(32);
+ CONSTRUCTORS;
+ }
+
+ _gp = (. + 0x8000);
+
+ .sdata . : {
+ _small_start = .;
+ *(.sdata)
+ . = ALIGN(32);
+ edata = .;
+ _edata = .;
+ }
+
+ .sbss . : {
+ __bss_start = .;
+ _fbss = .;
+ *(.sbss) *(.scommon)
+ _small_end = .;
+ . = ALIGN(32);
+ }
+
+ .bss . : {
+ *(.bss)
+ *(COMMON)
+ . = ALIGN(32);
+ _end = .;
+ end = .;
+ }
+
+}
Modified: projects/mips/sys/mips/conf/OCTEON1
==============================================================================
--- projects/mips/sys/mips/conf/OCTEON1 Tue Nov 24 14:40:50 2009 (r199750)
+++ projects/mips/sys/mips/conf/OCTEON1 Tue Nov 24 14:57:50 2009 (r199751)
@@ -22,14 +22,15 @@ cpu CPU_MIPS4KC
ident OCTEON1
makeoptions ARCH_FLAGS="-march=mips64 -mabi=64"
-makeoptions LDSCRIPT_NAME= ldscript.mips.mips64
+makeoptions LDSCRIPT_NAME=ldscript.mips.octeon.64
# Don't build any modules yet.
makeoptions MODULES_OVERRIDE=""
makeoptions TARGET_BIG_ENDIAN=defined
makeoptions TARGET_64BIT=defined
+makeoptions KERNLOADADDR=0xffffffff80100000
-options KERNVIRTADDR=0x80100000
+options KERNVIRTADDR=0xffffffff80100000
include "../octeon1/std.octeon1"
hints "OCTEON1.hints" #Default places to look for devices.
Modified: projects/mips/sys/mips/conf/OCTEON1-32
==============================================================================
--- projects/mips/sys/mips/conf/OCTEON1-32 Tue Nov 24 14:40:50 2009 (r199750)
+++ projects/mips/sys/mips/conf/OCTEON1-32 Tue Nov 24 14:57:50 2009 (r199751)
@@ -27,7 +27,7 @@ ident OCTEON1
# Don't build any modules yet.
makeoptions MODULES_OVERRIDE=""
makeoptions TARGET_BIG_ENDIAN=defined
-makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.kernel.32
+makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.32
#makeoptions TARGET_64BIT=defined
options KERNVIRTADDR=0x80100000
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 16:29:24 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 4BCE31065670;
Tue, 24 Nov 2009 16:29:24 +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 3B8658FC27;
Tue, 24 Nov 2009 16:29:24 +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 nAOGTOYr023620;
Tue, 24 Nov 2009 16:29:24 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOGTNtJ023619;
Tue, 24 Nov 2009 16:29:23 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911241629.nAOGTNtJ023619@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 16:29:23 +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: r199752 - projects/mips/sys/mips/mips
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 16:29:24 -0000
Author: imp
Date: Tue Nov 24 16:29:23 2009
New Revision: 199752
URL: http://svn.freebsd.org/changeset/base/199752
Log:
Make sure kstack0 is page aligned.
# this may have been from neel@ for the sibyte stuff
Modified:
projects/mips/sys/mips/mips/machdep.c
Modified: projects/mips/sys/mips/mips/machdep.c
==============================================================================
--- projects/mips/sys/mips/mips/machdep.c Tue Nov 24 14:57:50 2009 (r199751)
+++ projects/mips/sys/mips/mips/machdep.c Tue Nov 24 16:29:23 2009 (r199752)
@@ -42,6 +42,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_cputype.h"
#include "opt_ddb.h"
#include "opt_md.h"
#include "opt_msgbuf.h"
@@ -259,8 +260,12 @@ void
mips_proc0_init(void)
{
proc_linkup(&proc0, &thread0);
+
+ KASSERT((kstack0 & PAGE_MASK) == 0,
+ ("kstack0 is not aligned on a page boundary: %#lx\n",
+ (unsigned long)kstack0));
thread0.td_kstack = kstack0;
- thread0.td_kstack_pages = KSTACK_PAGES - 1;
+ thread0.td_kstack_pages = KSTACK_PAGES;
thread0.td_md.md_realstack = roundup2(thread0.td_kstack, PAGE_SIZE * 2);
/* Initialize pcpu info of cpu-zero */
#ifdef SMP
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 16:30:29 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 D36631065672;
Tue, 24 Nov 2009 16:30:29 +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 C374D8FC15;
Tue, 24 Nov 2009 16:30:29 +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 nAOGUTTk023692;
Tue, 24 Nov 2009 16:30:29 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOGUTwn023690;
Tue, 24 Nov 2009 16:30:29 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911241630.nAOGUTwn023690@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 16:30:29 +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: r199753 - projects/mips/sys/mips/mips
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 16:30:29 -0000
Author: imp
Date: Tue Nov 24 16:30:29 2009
New Revision: 199753
URL: http://svn.freebsd.org/changeset/base/199753
Log:
Remove a comment that's bogus.
Include opt_cputype.h since TARGET_OCTEON moved there.
Modified:
projects/mips/sys/mips/mips/mainbus.c
Modified: projects/mips/sys/mips/mips/mainbus.c
==============================================================================
--- projects/mips/sys/mips/mips/mainbus.c Tue Nov 24 16:29:23 2009 (r199752)
+++ projects/mips/sys/mips/mips/mainbus.c Tue Nov 24 16:30:29 2009 (r199753)
@@ -44,6 +44,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_cputype.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
@@ -265,7 +267,6 @@ mainbus_activate_resource(device_t bus,
+ poffs;
}
rman_set_virtual(r, vaddr);
- /* IBM-PC: the type of bus_space_handle_t is u_int */
#ifdef TARGET_OCTEON
temp = 0x0000000000000000;
temp |= (uint32_t)vaddr;
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 16:32:31 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 E5D1A106568B;
Tue, 24 Nov 2009 16:32:31 +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 D4AC08FC08;
Tue, 24 Nov 2009 16:32:31 +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 nAOGWVWx023769;
Tue, 24 Nov 2009 16:32:31 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOGWVSs023757;
Tue, 24 Nov 2009 16:32:31 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911241632.nAOGWVSs023757@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 16:32:31 +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: r199754 - in projects/mips/sys/mips: conf include mips
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 16:32:32 -0000
Author: imp
Date: Tue Nov 24 16:32:31 2009
New Revision: 199754
URL: http://svn.freebsd.org/changeset/base/199754
Log:
Include opt_cputype.h for all .c and .S files referencing TARGET_OCTEON.
Spell ld script name right.
# for the most part, we need to enhance infrastructure to obviate the need
# for such an intrusive option.
Modified:
projects/mips/sys/mips/conf/OCTEON1
projects/mips/sys/mips/include/cpufunc.h
projects/mips/sys/mips/mips/cache.c
projects/mips/sys/mips/mips/cache_mipsNN.c
projects/mips/sys/mips/mips/cpu.c
projects/mips/sys/mips/mips/exception.S
projects/mips/sys/mips/mips/pm_machdep.c
projects/mips/sys/mips/mips/psraccess.S
projects/mips/sys/mips/mips/support.S
projects/mips/sys/mips/mips/tick.c
projects/mips/sys/mips/mips/vm_machdep.c
Modified: projects/mips/sys/mips/conf/OCTEON1
==============================================================================
--- projects/mips/sys/mips/conf/OCTEON1 Tue Nov 24 16:30:29 2009 (r199753)
+++ projects/mips/sys/mips/conf/OCTEON1 Tue Nov 24 16:32:31 2009 (r199754)
@@ -22,7 +22,7 @@ cpu CPU_MIPS4KC
ident OCTEON1
makeoptions ARCH_FLAGS="-march=mips64 -mabi=64"
-makeoptions LDSCRIPT_NAME=ldscript.mips.octeon.64
+makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.64
# Don't build any modules yet.
makeoptions MODULES_OVERRIDE=""
Modified: projects/mips/sys/mips/include/cpufunc.h
==============================================================================
--- projects/mips/sys/mips/include/cpufunc.h Tue Nov 24 16:30:29 2009 (r199753)
+++ projects/mips/sys/mips/include/cpufunc.h Tue Nov 24 16:32:31 2009 (r199754)
@@ -208,12 +208,13 @@ mips_wr_ ## n ## s(uint32_t a0) \
#ifdef TARGET_OCTEON
static __inline void mips_sync_icache (void)
{
- __asm __volatile (
- ".set mips64\n"
- ".word 0x041f0000\n"
- "nop\n"
- ".set mips0\n"
- : : );
+ __asm __volatile (
+ ".set push\n"
+ ".set mips64\n"
+ ".word 0x041f0000\n" /* xxx ICACHE */
+ "nop\n"
+ ".set pop\n"
+ : : );
}
#endif
Modified: projects/mips/sys/mips/mips/cache.c
==============================================================================
--- projects/mips/sys/mips/mips/cache.c Tue Nov 24 16:30:29 2009 (r199753)
+++ projects/mips/sys/mips/mips/cache.c Tue Nov 24 16:32:31 2009 (r199754)
@@ -73,11 +73,11 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/systm.h>
+#include "opt_cputype.h"
+
#include <machine/cpuinfo.h>
#include <machine/cache.h>
-#include "opt_cputype.h"
-
struct mips_cache_ops mips_cache_ops;
void
Modified: projects/mips/sys/mips/mips/cache_mipsNN.c
==============================================================================
--- projects/mips/sys/mips/mips/cache_mipsNN.c Tue Nov 24 16:30:29 2009 (r199753)
+++ projects/mips/sys/mips/mips/cache_mipsNN.c Tue Nov 24 16:32:31 2009 (r199754)
@@ -38,6 +38,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_cputype.h"
+
#include <sys/types.h>
#include <sys/systm.h>
#include <sys/param.h>
Modified: projects/mips/sys/mips/mips/cpu.c
==============================================================================
--- projects/mips/sys/mips/mips/cpu.c Tue Nov 24 16:30:29 2009 (r199753)
+++ projects/mips/sys/mips/mips/cpu.c Tue Nov 24 16:32:31 2009 (r199754)
@@ -27,6 +27,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_cputype.h"
+
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/module.h>
@@ -49,8 +51,6 @@ __FBSDID("$FreeBSD$");
#include <machine/pte.h>
#include <machine/hwfunc.h>
-#include "opt_cputype.h"
-
static struct mips_cpuinfo cpuinfo;
union cpuprid cpu_id;
Modified: projects/mips/sys/mips/mips/exception.S
==============================================================================
--- projects/mips/sys/mips/mips/exception.S Tue Nov 24 16:30:29 2009 (r199753)
+++ projects/mips/sys/mips/mips/exception.S Tue Nov 24 16:32:31 2009 (r199754)
@@ -62,6 +62,8 @@
#include <machine/cpuregs.h>
#include <machine/pte.h>
+#include "opt_cputype.h"
+
#include "assym.s"
#if defined(ISA_MIPS32)
Modified: projects/mips/sys/mips/mips/pm_machdep.c
==============================================================================
--- projects/mips/sys/mips/mips/pm_machdep.c Tue Nov 24 16:30:29 2009 (r199753)
+++ projects/mips/sys/mips/mips/pm_machdep.c Tue Nov 24 16:32:31 2009 (r199754)
@@ -39,6 +39,8 @@
__FBSDID("$FreeBSD$");
#include "opt_compat.h"
+#include "opt_cputype.h"
+
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
Modified: projects/mips/sys/mips/mips/psraccess.S
==============================================================================
--- projects/mips/sys/mips/mips/psraccess.S Tue Nov 24 16:30:29 2009 (r199753)
+++ projects/mips/sys/mips/mips/psraccess.S Tue Nov 24 16:32:31 2009 (r199754)
@@ -41,6 +41,8 @@
#include <machine/cpu.h>
#include <machine/regnum.h>
+#include "opt_cputype.h"
+
#include "assym.s"
/*
Modified: projects/mips/sys/mips/mips/support.S
==============================================================================
--- projects/mips/sys/mips/mips/support.S Tue Nov 24 16:30:29 2009 (r199753)
+++ projects/mips/sys/mips/mips/support.S Tue Nov 24 16:32:31 2009 (r199754)
@@ -55,6 +55,7 @@
* assembly language support routines.
*/
+#include "opt_cputype.h"
#include "opt_ddb.h"
#include <sys/errno.h>
#include <machine/asm.h>
Modified: projects/mips/sys/mips/mips/tick.c
==============================================================================
--- projects/mips/sys/mips/mips/tick.c Tue Nov 24 16:30:29 2009 (r199753)
+++ projects/mips/sys/mips/mips/tick.c Tue Nov 24 16:32:31 2009 (r199754)
@@ -33,6 +33,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_cputype.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysctl.h>
Modified: projects/mips/sys/mips/mips/vm_machdep.c
==============================================================================
--- projects/mips/sys/mips/mips/vm_machdep.c Tue Nov 24 16:30:29 2009 (r199753)
+++ projects/mips/sys/mips/mips/vm_machdep.c Tue Nov 24 16:32:31 2009 (r199754)
@@ -41,6 +41,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_cputype.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 16:53:58 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 A61AB1065672;
Tue, 24 Nov 2009 16:53:58 +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 961998FC14;
Tue, 24 Nov 2009 16:53:58 +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 nAOGrwnX024202;
Tue, 24 Nov 2009 16:53:58 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOGrwCw024200;
Tue, 24 Nov 2009 16:53:58 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911241653.nAOGrwCw024200@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 16:53:58 +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: r199755 - projects/mips/sys/mips/mips
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 16:53:58 -0000
Author: imp
Date: Tue Nov 24 16:53:58 2009
New Revision: 199755
URL: http://svn.freebsd.org/changeset/base/199755
Log:
looks like there's more to this patch than just this one file. I'll
leave it to neel@ to get all the relevant pieces into the tree.
# we now get well into mi_start before we die
Modified:
projects/mips/sys/mips/mips/machdep.c
Modified: projects/mips/sys/mips/mips/machdep.c
==============================================================================
--- projects/mips/sys/mips/mips/machdep.c Tue Nov 24 16:32:31 2009 (r199754)
+++ projects/mips/sys/mips/mips/machdep.c Tue Nov 24 16:53:58 2009 (r199755)
@@ -261,11 +261,8 @@ mips_proc0_init(void)
{
proc_linkup(&proc0, &thread0);
- KASSERT((kstack0 & PAGE_MASK) == 0,
- ("kstack0 is not aligned on a page boundary: %#lx\n",
- (unsigned long)kstack0));
thread0.td_kstack = kstack0;
- thread0.td_kstack_pages = KSTACK_PAGES;
+ thread0.td_kstack_pages = KSTACK_PAGES - 1;
thread0.td_md.md_realstack = roundup2(thread0.td_kstack, PAGE_SIZE * 2);
/* Initialize pcpu info of cpu-zero */
#ifdef SMP
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 17:06:12 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 3909F1065694;
Tue, 24 Nov 2009 17:06:12 +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 2936F8FC22;
Tue, 24 Nov 2009 17:06:12 +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 nAOH6Cg5024564;
Tue, 24 Nov 2009 17:06:12 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOH6CRn024562;
Tue, 24 Nov 2009 17:06:12 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911241706.nAOH6CRn024562@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 17:06:12 +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: r199758 - projects/mips/sys/kern
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 17:06:12 -0000
Author: imp
Date: Tue Nov 24 17:06:11 2009
New Revision: 199758
URL: http://svn.freebsd.org/changeset/base/199758
Log:
Only all critical_enter()/critical_exit() if curthread has been set.
Otherwise we dereference a null pointer and can't get useful panic
info early in boot.
Modified:
projects/mips/sys/kern/kern_shutdown.c
Modified: projects/mips/sys/kern/kern_shutdown.c
==============================================================================
--- projects/mips/sys/kern/kern_shutdown.c Tue Nov 24 16:57:35 2009 (r199757)
+++ projects/mips/sys/kern/kern_shutdown.c Tue Nov 24 17:06:11 2009 (r199758)
@@ -516,7 +516,8 @@ panic(const char *fmt, ...)
va_list ap;
static char buf[256];
- critical_enter();
+ if (td)
+ critical_enter();
#ifdef SMP
/*
* We don't want multiple CPU's to panic at the same time, so we
@@ -575,7 +576,8 @@ panic(const char *fmt, ...)
/* thread_unlock(td); */
if (!sync_on_panic)
bootopt |= RB_NOSYNC;
- critical_exit();
+ if (td)
+ critical_exit();
boot(bootopt);
}
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 17:14:23 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 A2DCD106568F;
Tue, 24 Nov 2009 17:14:23 +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 92B1A8FC1B;
Tue, 24 Nov 2009 17:14: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 nAOHENLU024736;
Tue, 24 Nov 2009 17:14:23 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOHENpO024734;
Tue, 24 Nov 2009 17:14:23 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911241714.nAOHENpO024734@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 17:14:23 +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: r199759 - projects/mips/sys/mips/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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 17:14:23 -0000
Author: imp
Date: Tue Nov 24 17:14:23 2009
New Revision: 199759
URL: http://svn.freebsd.org/changeset/base/199759
Log:
kill stray printf
Modified:
projects/mips/sys/mips/octeon1/octeon_machdep.c
Modified: projects/mips/sys/mips/octeon1/octeon_machdep.c
==============================================================================
--- projects/mips/sys/mips/octeon1/octeon_machdep.c Tue Nov 24 17:06:11 2009 (r199758)
+++ projects/mips/sys/mips/octeon1/octeon_machdep.c Tue Nov 24 17:14:23 2009 (r199759)
@@ -722,7 +722,6 @@ platform_start(__register_t a0, __regist
platform_counter_freq = 330000000UL; /* XXX: from idt */
mips_timer_init_params(platform_counter_freq, 1);
cninit();
- printf("Now is the time to get happy!\n");
/* Panic here, after cninit */
#if 0
if (mem == 0)
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 17:15:23 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 27ED4106568B;
Tue, 24 Nov 2009 17:15:23 +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 17EE28FC0C;
Tue, 24 Nov 2009 17:15: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 nAOHFM1S024800;
Tue, 24 Nov 2009 17:15:22 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOHFMFj024797;
Tue, 24 Nov 2009 17:15:22 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911241715.nAOHFMFj024797@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 17:15:22 +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: r199760 - in projects/mips/sys/mips: include mips
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 17:15:23 -0000
Author: imp
Date: Tue Nov 24 17:15:22 2009
New Revision: 199760
URL: http://svn.freebsd.org/changeset/base/199760
Log:
Add in Cavium's CID. Report what the unknown CID is.
Modified:
projects/mips/sys/mips/include/locore.h
projects/mips/sys/mips/mips/cpu.c
Modified: projects/mips/sys/mips/include/locore.h
==============================================================================
--- projects/mips/sys/mips/include/locore.h Tue Nov 24 17:14:23 2009 (r199759)
+++ projects/mips/sys/mips/include/locore.h Tue Nov 24 17:15:22 2009 (r199760)
@@ -60,6 +60,7 @@ typedef int mips_prid_t;
/* 0x09 unannounced */
/* 0x0a unannounced */
#define MIPS_PRID_CID_LEXRA 0x0b /* Lexra */
+#define MIPS_PRID_CID_CAVIUM 0x0d /* Cavium */
#define MIPS_PRID_COPTS(x) (((x) >> 24) & 0x00ff) /* Company Options */
#ifdef _KERNEL
Modified: projects/mips/sys/mips/mips/cpu.c
==============================================================================
--- projects/mips/sys/mips/mips/cpu.c Tue Nov 24 17:14:23 2009 (r199759)
+++ projects/mips/sys/mips/mips/cpu.c Tue Nov 24 17:15:22 2009 (r199760)
@@ -178,9 +178,12 @@ cpu_identify(void)
case MIPS_PRID_CID_LEXRA:
printf("Lexra");
break;
+ case MIPS_PRID_CID_CAVIUM:
+ printf("Cavium");
+ break;
case MIPS_PRID_CID_PREHISTORIC:
default:
- printf("Unknown");
+ printf("Unknown cid %#x", cpuinfo.cpu_vendor);
break;
}
printf(" processor v%d.%d\n", cpuinfo.cpu_rev, cpuinfo.cpu_impl);
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 21:04:24 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 4CCFC106566C;
Tue, 24 Nov 2009 21:04:24 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 3C5B78FC08;
Tue, 24 Nov 2009 21:04:24 +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 nAOL4Oaq029488;
Tue, 24 Nov 2009 21:04:24 GMT
(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOL4OIl029486;
Tue, 24 Nov 2009 21:04:24 GMT
(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911242104.nAOL4OIl029486@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 24 Nov 2009 21:04:24 +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: r199766 - projects/clangbsd
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 21:04:24 -0000
Author: rdivacky
Date: Tue Nov 24 21:04:23 2009
New Revision: 199766
URL: http://svn.freebsd.org/changeset/base/199766
Log:
use -B for the crt* stuff and link /usr/bin from $WORLTMP
to get the real ones.
Modified:
projects/clangbsd/Makefile.inc1
Modified: projects/clangbsd/Makefile.inc1
==============================================================================
--- projects/clangbsd/Makefile.inc1 Tue Nov 24 20:04:31 2009 (r199765)
+++ projects/clangbsd/Makefile.inc1 Tue Nov 24 21:04:23 2009 (r199766)
@@ -277,7 +277,7 @@ LIB32CPUFLAGS= -march=${TARGET_CPUTYPE}
LIB32FLAGS= -m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \
-isystem ${LIB32TMP}/usr/include/ \
-L${LIB32TMP}/usr/lib32 \
- -B${LIB32TMP}/usr/lib32
+ -B${LIB32TMP}
# Yes, the flags are redundant.
LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
@@ -442,6 +442,10 @@ build32:
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${LIB32TMP}/usr/include >/dev/null
mkdir -p ${WORLDTMP}
+ # relink /usr/bin to the lib32 tmp so the -B can pick up
+ # the /usr/bin/ld and /usr/bin/as
+ rm -rf ${LIB32TMP}/usr/bin/
+ ln -sf ${WORLDTMP}/usr/bin/ ${LIB32TMP}/usr/bin
ln -sf ${.CURDIR}/sys ${WORLDTMP}
.if ${MK_KERBEROS} != "no"
.for _t in obj depend all
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 21:06:42 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 2BE81106566B;
Tue, 24 Nov 2009 21:06:42 +0000 (UTC)
(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 19C358FC15;
Tue, 24 Nov 2009 21:06:42 +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 nAOL6fNl029568;
Tue, 24 Nov 2009 21:06:41 GMT
(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOL6f3r029563;
Tue, 24 Nov 2009 21:06:41 GMT
(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911242106.nAOL6f3r029563@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 24 Nov 2009 21:06:41 +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: r199767 - in projects/clangbsd/contrib/llvm/tools/clang:
include/clang/Driver lib/Driver
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 21:06:42 -0000
Author: rdivacky
Date: Tue Nov 24 21:06:41 2009
New Revision: 199767
URL: http://svn.freebsd.org/changeset/base/199767
Log:
Always link crt* stuff from /usr/lib/ or /usr/lib32
depending on wheteher we are cross compiling or not.
This reveales a problem wth lib32 build that I am going to fix.
Modified:
projects/clangbsd/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h
projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/HostInfo.cpp
projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
Modified: projects/clangbsd/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h Tue Nov 24 21:04:23 2009 (r199766)
+++ projects/clangbsd/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h Tue Nov 24 21:06:41 2009 (r199767)
@@ -27,6 +27,7 @@ namespace driver {
/// ToolChain - Access to tools for a single platform.
class ToolChain {
public:
+ bool Lib32;
typedef llvm::SmallVector<std::string, 4> path_list;
private:
Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/HostInfo.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/HostInfo.cpp Tue Nov 24 21:04:23 2009 (r199766)
+++ projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/HostInfo.cpp Tue Nov 24 21:06:41 2009 (r199767)
@@ -379,6 +379,7 @@ ToolChain *FreeBSDHostInfo::CreateToolCh
TCTriple.setArchName(ArchName);
TC = new toolchains::FreeBSD(*this, TCTriple, Lib32);
+ TC->Lib32 = Lib32;
}
return TC;
Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp Tue Nov 24 21:04:23 2009 (r199766)
+++ projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp Tue Nov 24 21:06:41 2009 (r199767)
@@ -651,10 +651,8 @@ Tool &OpenBSD::SelectTool(const Compilat
FreeBSD::FreeBSD(const HostInfo &Host, const llvm::Triple& Triple, bool Lib32)
: Generic_GCC(Host, Triple) {
if (Lib32) {
- getFilePaths().push_back(getHost().getDriver().Dir + "/../lib32");
getFilePaths().push_back("/usr/lib32");
} else {
- getFilePaths().push_back(getHost().getDriver().Dir + "/../lib");
getFilePaths().push_back("/usr/lib");
}
}
Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Tue Nov 24 21:04:23 2009 (r199766)
+++ projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Tue Nov 24 21:06:41 2009 (r199767)
@@ -2543,6 +2543,7 @@ void freebsd::Link::ConstructJob(Compila
const char *LinkingOutput) const {
const Driver &D = getToolChain().getHost().getDriver();
ArgStringList CmdArgs;
+ std::string LibPrefix("/usr/lib/");
if (Args.hasArg(options::OPT_static)) {
CmdArgs.push_back("-Bstatic");
@@ -2561,6 +2562,8 @@ void freebsd::Link::ConstructJob(Compila
if (getToolChain().getArchName() == "i386") {
CmdArgs.push_back("-m");
CmdArgs.push_back("elf_i386_fbsd");
+ if (getToolChain().Lib32)
+ LibPrefix = "/usr/lib32/";
}
if (Output.isPipe()) {
@@ -2576,12 +2579,12 @@ void freebsd::Link::ConstructJob(Compila
if (!Args.hasArg(options::OPT_nostdlib) &&
!Args.hasArg(options::OPT_nostartfiles)) {
if (!Args.hasArg(options::OPT_shared)) {
- CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crt1.o")));
- CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crti.o")));
- CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtbegin.o")));
+ CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, (LibPrefix + "crt1.o").c_str())));
+ CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, (LibPrefix + "crti.o").c_str())));
+ CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, (LibPrefix + "crtbegin.o").c_str())));
} else {
- CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crti.o")));
- CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtbeginS.o")));
+ CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, (LibPrefix + "crti.o").c_str())));
+ CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, (LibPrefix + "crtbeginS.o").c_str())));
}
}
@@ -2642,10 +2645,10 @@ void freebsd::Link::ConstructJob(Compila
if (!Args.hasArg(options::OPT_nostdlib) &&
!Args.hasArg(options::OPT_nostartfiles)) {
if (!Args.hasArg(options::OPT_shared))
- CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtend.o")));
+ CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, (LibPrefix + "crtend.o").c_str())));
else
- CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtendS.o")));
- CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, "crtn.o")));
+ CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, (LibPrefix + "crtendS.o").c_str())));
+ CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(C, (LibPrefix + "crtn.o").c_str())));
}
const char *Exec =
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 22:04:14 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 1B1A5106568B
for <svn-src-projects@freebsd.org>;
Tue, 24 Nov 2009 22:04:14 +0000 (UTC)
(envelope-from rdivacky@vlk.vlakno.cz)
Received: from vlakno.cz (77-93-215-190.static.masterinter.net [77.93.215.190])
by mx1.freebsd.org (Postfix) with ESMTP id CA1DD8FC18
for <svn-src-projects@freebsd.org>;
Tue, 24 Nov 2009 22:04:13 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
by vlakno.cz (Postfix) with ESMTP id 5F7679CB0CA;
Tue, 24 Nov 2009 22:43:35 +0100 (CET)
X-Virus-Scanned: amavisd-new at vlakno.cz
Received: from vlakno.cz ([127.0.0.1])
by localhost (lev.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id vKPn+yU9jyMT; Tue, 24 Nov 2009 22:43:33 +0100 (CET)
Received: from vlk.vlakno.cz (localhost [127.0.0.1])
by vlakno.cz (Postfix) with ESMTP id 0EB5F9CB0F7;
Tue, 24 Nov 2009 22:43:33 +0100 (CET)
Received: (from rdivacky@localhost)
by vlk.vlakno.cz (8.14.3/8.14.3/Submit) id nAOLhX60057751;
Tue, 24 Nov 2009 22:43:33 +0100 (CET) (envelope-from rdivacky)
Date: Tue, 24 Nov 2009 22:43:33 +0100
From: Roman Divacky <rdivacky@freebsd.org>
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Message-ID: <20091124214333.GA56157@freebsd.org>
References: <200911242104.nAOL4OIl029486@svn.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200911242104.nAOL4OIl029486@svn.freebsd.org>
User-Agent: Mutt/1.4.2.3i
Cc:
Subject: Re: svn commit: r199766 - projects/clangbsd
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 22:04:14 -0000
On Tue, Nov 24, 2009 at 09:04:24PM +0000, Roman Divacky wrote:
> Author: rdivacky
> Date: Tue Nov 24 21:04:23 2009
> New Revision: 199766
> URL: http://svn.freebsd.org/changeset/base/199766
>
> Log:
> use -B for the crt* stuff and link /usr/bin from $WORLTMP
> to get the real ones.
pointed out by: ru
sorry ruslan
From owner-svn-src-projects@FreeBSD.ORG Tue Nov 24 22:04:14 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 1EFD81065696
for <svn-src-projects@freebsd.org>;
Tue, 24 Nov 2009 22:04:14 +0000 (UTC)
(envelope-from rdivacky@vlk.vlakno.cz)
Received: from vlakno.cz (77-93-215-190.static.masterinter.net [77.93.215.190])
by mx1.freebsd.org (Postfix) with ESMTP id CD7AA8FC1A
for <svn-src-projects@freebsd.org>;
Tue, 24 Nov 2009 22:04:13 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
by vlakno.cz (Postfix) with ESMTP id EEE9D9CB0E9;
Tue, 24 Nov 2009 22:44:37 +0100 (CET)
X-Virus-Scanned: amavisd-new at vlakno.cz
Received: from vlakno.cz ([127.0.0.1])
by localhost (lev.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id rTePaz6xhfxw; Tue, 24 Nov 2009 22:44:35 +0100 (CET)
Received: from vlk.vlakno.cz (localhost [127.0.0.1])
by vlakno.cz (Postfix) with ESMTP id 9DA3B9CB104;
Tue, 24 Nov 2009 22:44:35 +0100 (CET)
Received: (from rdivacky@localhost)
by vlk.vlakno.cz (8.14.3/8.14.3/Submit) id nAOLiZZw057899;
Tue, 24 Nov 2009 22:44:35 +0100 (CET) (envelope-from rdivacky)
Date: Tue, 24 Nov 2009 22:44:35 +0100
From: Roman Divacky <rdivacky@freebsd.org>
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Message-ID: <20091124214435.GB56157@freebsd.org>
References: <200911242106.nAOL6f3r029563@svn.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200911242106.nAOL6f3r029563@svn.freebsd.org>
User-Agent: Mutt/1.4.2.3i
Cc:
Subject: Re: svn commit: r199767 - in
projects/clangbsd/contrib/llvm/tools/clang:
include/clang/Driver lib/Driver
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 22:04:14 -0000
On Tue, Nov 24, 2009 at 09:06:41PM +0000, Roman Divacky wrote:
> Author: rdivacky
> Date: Tue Nov 24 21:06:41 2009
> New Revision: 199767
> URL: http://svn.freebsd.org/changeset/base/199767
>
> Log:
> Always link crt* stuff from /usr/lib/ or /usr/lib32
> depending on wheteher we are cross compiling or not.
>
> This reveales a problem wth lib32 build that I am going to fix.
so far we were linking in /usr/lib{32}/crt* istead of the build ones.
this is waaaay too wrong. this fixes it and thus introducing the lib32
breakage
pointed out by: ru
From owner-svn-src-projects@FreeBSD.ORG Thu Nov 26 15:50:53 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 08DA51065679;
Thu, 26 Nov 2009 15:50:53 +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 D3A718FC21;
Thu, 26 Nov 2009 15:50:52 +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 nAQFoqmL086769;
Thu, 26 Nov 2009 15:50:52 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAQFoqb5086768;
Thu, 26 Nov 2009 15:50:52 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911261550.nAQFoqb5086768@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 26 Nov 2009 15:50:52 +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: r199839 - projects/mips/sys/mips/conf
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Nov 2009 15:50:53 -0000
Author: imp
Date: Thu Nov 26 15:50:52 2009
New Revision: 199839
URL: http://svn.freebsd.org/changeset/base/199839
Log:
This file is OBE and should have been removed when we renamed things
to OCTEON1.hints.
Submitted by: jmallet
Deleted:
projects/mips/sys/mips/conf/OCTEON.hints