From owner-svn-src-head@FreeBSD.ORG Sat Aug 25 12:02:14 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79E0B1065670; Sat, 25 Aug 2012 12:02:14 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6440C8FC17; Sat, 25 Aug 2012 12:02:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7PC2E1T034677; Sat, 25 Aug 2012 12:02:14 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7PC2EL6034670; Sat, 25 Aug 2012 12:02:14 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201208251202.q7PC2EL6034670@svn.freebsd.org> From: Robert Watson Date: Sat, 25 Aug 2012 12:02:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239679 - head/sys/mips/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Aug 2012 12:02:14 -0000 Author: rwatson Date: Sat Aug 25 12:02:13 2012 New Revision: 239679 URL: http://svn.freebsd.org/changeset/base/239679 Log: Add reference kernel configurations for FreeBSD/beri in simulation, on the Terasic DE-4, and Terasic tPad Altera-based boards. Sponsored by: DARPA, AFRL Added: head/sys/mips/conf/BERI_DE4.hints (contents, props changed) head/sys/mips/conf/BERI_DE4_MDROOT (contents, props changed) head/sys/mips/conf/BERI_DE4_SDROOT (contents, props changed) head/sys/mips/conf/BERI_SIM.hints (contents, props changed) head/sys/mips/conf/BERI_SIM_MDROOT (contents, props changed) head/sys/mips/conf/BERI_TEMPLATE (contents, props changed) head/sys/mips/conf/BERI_TPAD.hints (contents, props changed) Added: head/sys/mips/conf/BERI_DE4.hints ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/conf/BERI_DE4.hints Sat Aug 25 12:02:13 2012 (r239679) @@ -0,0 +1,72 @@ +# $FreeBSD$ + +# +# Altera JTAG UARTs configured for console, debugging, and data putput on the +# Terasic DE-4. +# +hint.altera_jtag_uart.0.at="nexus0" +hint.altera_jtag_uart.0.maddr=0x7f000000 +hint.altera_jtag_uart.0.msize=0x40 +hint.altera_jtag_uart.0.irq=0 + +hint.altera_jtag_uart.1.at="nexus0" +hint.altera_jtag_uart.1.maddr=0x7f001000 +hint.altera_jtag_uart.1.msize=0x40 + +hint.altera_jtag_uart.2.at="nexus0" +hint.altera_jtag_uart.2.maddr=0x7f002000 +hint.altera_jtag_uart.2.msize=0x40 + +# +# On-board DE4 and tPad SD Card IP core +# +hint.altera_sdcardc.0.at="nexus0" +hint.altera_sdcardc.0.maddr=0x7f008000 +hint.altera_sdcardc.0.msize=0x400 + +# +# BERI Hardware Version ROM +# +hint.altera_avgen.0.at="nexus0" +hint.altera_avgen.0.maddr=0x7F00A000 +hint.altera_avgen.0.msize=20 +hint.altera_avgen.0.width=4 +hint.altera_avgen.0.fileio="rw" +hint.altera_avgen.0.devname="berirom" + +# +# Expose the DE4 flash via an Avalon "generic" device. +# This is incompatible with the isf(4) driver. +# +#hint.altera_avgen.0.at="nexus0" +#hint.altera_avgen.0.maddr=0x74000000 +#hint.altera_avgen.0.msize=0x4000000 +#hint.altera_avgen.0.width=2 +#hint.altera_avgen.0.fileio="rw" +#hint.altera_avgen.0.mmapio="rwx" +#hint.altera_avgen.0.devname="de4flash" + +# Reserved configuration blocks. Don't touch. +hint.map.0.at="isf0" +hint.map.0.start=0x00000000 +hint.map.0.end=0x00020000 +hint.map.0.name="config" +hint.map.0.readonly=1 + +# Hardwired location of bitfile +hint.map.1.at="isf0" +hint.map.1.start=0x00020000 +hint.map.1.end=0x01820000 +hint.map.1.name="fpga" + +# Kernel on first chip +hint.map.2.at="isf0" +hint.map.2.start=0x01820000 +hint.map.2.end=0x02000000 +hint.map.2.name="reserved" + +# The second chip +hint.map.3.at="isf1" +hint.map.3.start=0x00000000 +hint.map.3.end=0x02000000 +hint.map.3.name="kernel" Added: head/sys/mips/conf/BERI_DE4_MDROOT ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/conf/BERI_DE4_MDROOT Sat Aug 25 12:02:13 2012 (r239679) @@ -0,0 +1,28 @@ +# +# BERI_DE4 -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible RISC +# Implementation) FPGA soft core, as configured in its Terasic DE-4 reference +# configuration. +# +# $FreeBSD$ +# + +include "BERI_TEMPLATE" + +ident BERI_DE4_MDROOT + +hints "BERI_DE4.hints" #Default places to look for devices. + +# +# This kernel configuration uses an embedded 8MB memory root file system. +# Adjust the following path based on local requirements. +# +options MD_ROOT # MD is a potential root device +options MD_ROOT_SIZE=8192 +makeoptions MFS_IMAGE=/local/scratch/rnw24/mdroot.img +options ROOTDEVNAME=\"ufs:md0\" + +device altera_avgen +device altera_jtag_uart +device altera_sdcard + +device sc Added: head/sys/mips/conf/BERI_DE4_SDROOT ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/conf/BERI_DE4_SDROOT Sat Aug 25 12:02:13 2012 (r239679) @@ -0,0 +1,21 @@ +# +# BERI_DE4 -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible RISC +# Implementation) FPGA soft core, as configured in its Terasic DE-4 reference +# configuration. +# +# $FreeBSD$ +# + +include "BERI_TEMPLATE" + +ident BERI_DE4_SDROOT + +hints "BERI_DE4.hints" #Default places to look for devices. + +options ROOTDEVNAME=\"ufs:altera_sdcard0\" + +device altera_avgen +device altera_jtag_uart +device altera_sdcard + +device sc Added: head/sys/mips/conf/BERI_SIM.hints ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/conf/BERI_SIM.hints Sat Aug 25 12:02:13 2012 (r239679) @@ -0,0 +1,26 @@ +# $FreeBSD$ + +# +# Altera JTAG UARTs configured for console, debugging, and data putput on the +# BERI simulator. +# +hint.altera_jtag_uart.0.at="nexus0" +hint.altera_jtag_uart.0.maddr=0x7f000000 +hint.altera_jtag_uart.0.msize=0x40 +hint.altera_jtag_uart.0.irq=0 + +hint.altera_jtag_uart.1.at="nexus0" +hint.altera_jtag_uart.1.maddr=0x7f001000 +hint.altera_jtag_uart.1.msize=0x40 + +hint.altera_jtag_uart.2.at="nexus0" +hint.altera_jtag_uart.2.maddr=0x7f002000 +hint.altera_jtag_uart.2.msize=0x40 + +# +# On-board DE4 and tPad SD Card IP core -- also present in Bluespec +# simulation. +# +hint.altera_sdcardc.0.at="nexus0" +hint.altera_sdcardc.0.maddr=0x7f008000 +hint.altera_sdcardc.0.msize=0x400 Added: head/sys/mips/conf/BERI_SIM_MDROOT ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/conf/BERI_SIM_MDROOT Sat Aug 25 12:02:13 2012 (r239679) @@ -0,0 +1,25 @@ +# +# BERI_SIM -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible RISC +# Implementation) FPGA soft core, as configured for simulation. +# +# $FreeBSD$ +# + +include "BERI_TEMPLATE" + +ident BERI_SIM_MDROOT + +hints "BERI_SIM.hints" #Default places to look for devices. + +# +# This kernel configuration uses an embedded 8MB memory root file system. +# Adjust the following path based on local requirements. +# +options MD_ROOT # MD is a potential root device +options MD_ROOT_SIZE=8192 +makeoptions MFS_IMAGE=/local/scratch/rnw24/mdroot.img +options ROOTDEVNAME=\"ufs:md0\" + +device altera_avgen +device altera_jtag_uart +device altera_sdcard Added: head/sys/mips/conf/BERI_TEMPLATE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/conf/BERI_TEMPLATE Sat Aug 25 12:02:13 2012 (r239679) @@ -0,0 +1,58 @@ +# +# BERI_TEMPLATE -- a template kernel configuration for the SRI/Cambridge +# "BERI" (Bluespec Extensible RISC Implementation) FPGA soft core CPU. This +# kernel configuration file will be included by other board-specific files, +# and so contains only BERI features common across all board targets. +# +# $FreeBSD$ +# + +ident BERI_TEMPLATE + +machine mips mips64 + +cpu CPU_BERI + +options HZ=200 + +makeoptions ARCH_FLAGS="-march=mips64 -mabi=64" + +makeoptions KERNLOADADDR=0xffffffff80100000 + +include "../beri/std.beri" + +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols + +makeoptions MODULES_OVERRIDE="" + +options DDB +options KDB +options ALT_BREAK_TO_DEBUGGER +options KTRACE + +options CAPABILITY_MODE +options CAPABILITIES + +options SCHED_ULE + +options FFS #Berkeley Fast Filesystem + +options INET +options INET6 +options NFSCL +options NFS_ROOT + +# Debugging for use in -current +#options DEADLKRES #Enable the deadlock resolver +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS #Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed + +device geom_map + +device md +device ether +device loop +device random +device snp Added: head/sys/mips/conf/BERI_TPAD.hints ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/conf/BERI_TPAD.hints Sat Aug 25 12:02:13 2012 (r239679) @@ -0,0 +1,51 @@ +# $FreeBSD$ + +# +# Altera JTAG UARTs configured for console, debugging, and data putput on the +# Terasic tPad. +# +hint.altera_jtag_uart.0.at="nexus0" +hint.altera_jtag_uart.0.maddr=0x7f000000 +hint.altera_jtag_uart.0.msize=0x40 +hint.altera_jtag_uart.0.irq=0 + +hint.altera_jtag_uart.1.at="nexus0" +hint.altera_jtag_uart.1.maddr=0x7f001000 +hint.altera_jtag_uart.1.msize=0x40 + +hint.altera_jtag_uart.2.at="nexus0" +hint.altera_jtag_uart.2.maddr=0x7f002000 +hint.altera_jtag_uart.2.msize=0x40 + +# +# Expose the tPad touchscreen device via an Avalon "generic" device. Observe +# that this is a portion of DRAM, so some care may be required in how memory +# is exposed to FreeBSD to avoid use of that DRAM for both the touch screen +# and FreeBSD use. +# +# Two separate devices are used here because alignment/width requirements for +# I/O differ: the frame buffer accepts 16-bit I/O, and the touch input device +# requires 32-bit I/O. +# +hint.altera_avgen.0.at="nexus0" +hint.altera_avgen.0.maddr=0x04000000 +hint.altera_avgen.0.msize=0x01000000 +hint.altera_avgen.0.width=2 +hint.altera_avgen.0.fileio="rw" +hint.altera_avgen.0.mmapio="rw" +hint.altera_avgen.0.devname="display" + +hint.altera_avgen.1.at="nexus0" +hint.altera_avgen.1.maddr=0x05000000 +hint.altera_avgen.1.msize=0x00000020 +hint.altera_avgen.1.width=4 +hint.altera_avgen.1.fileio="rw" +hint.altera_avgen.1.mmapio="rw" +hint.altera_avgen.1.devname="touch" + +# +# On-board DE4 and tPad SD Card IP core +# +hint.altera_sdcardc.0.at="nexus0" +hint.altera_sdcardc.0.maddr=0x7f008000 +hint.altera_sdcardc.0.msize=0x400