From owner-p4-projects@FreeBSD.ORG  Thu May 30 15:39:06 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 294DB677; Thu, 30 May 2013 15:39:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E04DC675
 for <perforce@freebsd.org>; Thu, 30 May 2013 15:39:05 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D1E20F80
 for <perforce@freebsd.org>; Thu, 30 May 2013 15:39:05 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r4UFd5Xa060293
 for <perforce@freebsd.org>; Thu, 30 May 2013 15:39:05 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r4UFd5Al060290
 for perforce@freebsd.org; Thu, 30 May 2013 15:39:05 GMT
 (envelope-from brooks@freebsd.org)
Date: Thu, 30 May 2013 15:39:05 GMT
Message-Id: <201305301539.r4UFd5Al060290@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 229154 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 May 2013 15:39:06 -0000

http://p4web.freebsd.org/@@229154?ac=10

Change 229154 by brooks@brooks_zenith on 2013/05/30 15:38:52

	Split BERI_SIM_MDROOT adding BERI_SIM_BASE.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_SIM_BASE#1 add
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_SIM_MDROOT#8 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_SIM_MDROOT#8 (text+ko) ====

@@ -1,18 +1,14 @@
 #
-# BERI_SIM -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible RISC
-# Implementation) FPGA soft core, as configured for simulation.
+# BERI_SIM_MDROOT -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible
+# RISC Implementation) FPGA soft core, as configured for simulation.
 #
 # $FreeBSD: head/sys/mips/conf/BERI_SIM_MDROOT 240139 2012-09-05 15:55:51Z brooks $
 #
 
-include "BERI_TEMPLATE"
+include "BERI_SIM_BASE"
 
 ident		BERI_SIM_MDROOT
 
-options 	FDT
-options 	FDT_DTB_STATIC
-makeoptions	FDT_DTS_FILE=beri-sim.dts
-
 #
 # This kernel configuration uses an embedded 8MB memory root file system.
 # Adjust the following path based on local requirements.
@@ -20,7 +16,3 @@
 options 	MD_ROOT			# MD is a potential root device
 options 	MD_ROOT_SIZE=8192
 options 	ROOTDEVNAME=\"ufs:md0\"
-
-device		altera_avgen
-device		altera_jtag_uart
-device		altera_sdcard