From owner-p4-projects@FreeBSD.ORG  Mon Jan  7 20:23:02 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 345496C5; Mon,  7 Jan 2013 20:23:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E44DC6C3
 for <perforce@freebsd.org>; Mon,  7 Jan 2013 20:23:01 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id BA907369
 for <perforce@freebsd.org>; Mon,  7 Jan 2013 20:23:01 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id r07KN1Cv052457
 for <perforce@freebsd.org>; Mon, 7 Jan 2013 20:23:01 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id r07KN1ir052454
 for perforce@freebsd.org; Mon, 7 Jan 2013 20:23:01 GMT
 (envelope-from brooks@freebsd.org)
Date: Mon, 7 Jan 2013 20:23:01 GMT
Message-Id: <201301072023.r07KN1ir052454@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 219958 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: Mon, 07 Jan 2013 20:23:02 -0000

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

Change 219958 by brooks@brooks_zenith on 2013/01/07 20:22:20

	Revert two premature changes in 219957 that I submitted by
	mistake.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_MDROOT#6 edit
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/CHERI_DE4_MDROOT#3 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_MDROOT#6 (text+ko) ====

@@ -10,12 +10,7 @@
 
 ident		BERI_DE4_MDROOT
 
-#hints		"BERI_DE4.hints"	#Default places to look for devices.
-hints           "BERI_FDT_DE4.hints"    #Default places to look for devices.
-
-options         FDT
-options         FDT_DTB_STATIC
-makeoptions     FDT_DTS_FILE=beripad-de4.dts
+hints		"BERI_DE4.hints"	#Default places to look for devices.
 
 #
 # This kernel configuration uses an embedded 8MB memory root file system.

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/CHERI_DE4_MDROOT#3 (text+ko) ====

@@ -9,9 +9,5 @@
 include		BERI_DE4_MDROOT
 ident		CHERI_DE4_MDROOT
 
-nooptions	MD_ROOT_SIZE
-options		MD_ROOT_SIZE=25600
-makeoptions	MFS_IMAGE=/home/bed22/demoroot.img
-
 nocpu		CPU_BERI
 cpu		CPU_CHERI