From owner-p4-projects@FreeBSD.ORG  Wed Mar 21 20:11:11 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4295B1065670; Wed, 21 Mar 2012 20:11:11 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0558E106566B
	for <perforce@freebsd.org>; Wed, 21 Mar 2012 20:11:11 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id E1B608FC15
	for <perforce@freebsd.org>; Wed, 21 Mar 2012 20:11:10 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q2LKBAaB028963
	for <perforce@freebsd.org>; Wed, 21 Mar 2012 20:11:10 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q2LKBAqq028957
	for perforce@freebsd.org; Wed, 21 Mar 2012 20:11:10 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 21 Mar 2012 20:11:10 GMT
Message-Id: <201203212011.q2LKBAqq028957@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 208328 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Wed, 21 Mar 2012 20:11:11 -0000

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

Change 208328 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/03/21 20:10:27

	Rearrange the deckchairs a bit:
	
	- Make BERI and gxemul console "uarts" conditionally compiled using
	  the FreeBSD kernel config file "device" syntax.
	- Rename uart_gxemul.c to gxmul_uart.c to match reigning conventions
	  in the beri directory.
	- In the default BERI config file, use the Altera JTAG UART.
	- Add a BERI-derived GXEMUL config file that differs only in that it
	  uses the gxemul console driver.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#5 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_uart.c#1 add
.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/uart_gxemul.c#2 delete
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI#5 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/GXEMUL#1 add

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#5 (text+ko) ====

@@ -1,5 +1,6 @@
 # $FreeBSD$
 mips/beri/beri_machdep.c		standard
-mips/beri/altera_jtag_uart.c		standard
+mips/beri/altera_jtag_uart.c		optional altera_jtag_uart
+mips/beri/gxemul_uart.c			optional gxemul_uart
 mips/mips/intr_machdep.c		standard
 mips/mips/tick.c			standard

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

@@ -42,6 +42,10 @@
 
 options 	MD_ROOT			# MD is a potential root device
 options 	MD_ROOT_SIZE=8192
+makeoptions	MFS_IMAGE=/tmp/root.img
+options 	ROOTDEVNAME=\"ufs:md0\"
+
+device		altera_jtag_uart
 
 device		md
 device		loop