From owner-p4-projects@FreeBSD.ORG  Fri Mar 29 13:53:49 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id D771B648; Fri, 29 Mar 2013 13:53:48 +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 9838A646
 for <perforce@freebsd.org>; Fri, 29 Mar 2013 13:53:48 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6EA806F0
 for <perforce@freebsd.org>; Fri, 29 Mar 2013 13:53:48 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2TDrmZv027314
 for <perforce@freebsd.org>; Fri, 29 Mar 2013 13:53:48 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2TDrmoT027311
 for perforce@freebsd.org; Fri, 29 Mar 2013 13:53:48 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 29 Mar 2013 13:53:48 GMT
Message-Id: <201303291353.r2TDrmoT027311@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>
Subject: PERFORCE change 227213 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: Fri, 29 Mar 2013 13:53:49 -0000

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

Change 227213 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/03/29 13:53:30

	Relocate driver-related BERI boot2 source files to a common directory
	so that they can be reused by the BERI loader.  Rename start.s to
	start.S for consistency (and because the preprocessor may come in
	handy in the future).

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/Makefile#6 edit
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/altera_jtag_uart.c#4 delete
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/boot2.c#7 edit
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/cons.h#4 delete
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/drv.h#2 delete
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/flash.c#2 delete
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/start.S#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/start.s#2 delete
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/altera_jtag_uart.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/cons.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/drv.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/flash.c#1 branch

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/Makefile#6 (text+ko) ====

@@ -5,7 +5,7 @@
 INSTALLFLAGS=	-b
 
 FILES=		${PROG}
-SRCS=		start.s			\
+SRCS=		start.S			\
 		boot2.c			\
 		altera_jtag_uart.c	\
 		flash.c
@@ -30,6 +30,9 @@
 		-T ${.CURDIR}/linker.cfg	\
 		-G0
 
+.PATH:		${.CURDIR}/../common
+CFLAGS+=	-I${.CURDIR}/../common
+
 boot2: linker.cfg
 
 boot2.img: boot2

==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/boot2.c#7 (text+ko) ====

@@ -56,8 +56,8 @@
 
 #include <stdarg.h>
 
-#include "cons.h"
-#include "drv.h"
+#include <cons.h>
+#include <drv.h>
 
 #define IO_KEYBOARD	1
 #define IO_SERIAL	2