From owner-p4-projects@FreeBSD.ORG  Mon Apr  1 19:37: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 7DA10F8E; Mon,  1 Apr 2013 19:37:49 +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 3DFAEF8C
 for <perforce@freebsd.org>; Mon,  1 Apr 2013 19:37:49 +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 2E968C26
 for <perforce@freebsd.org>; Mon,  1 Apr 2013 19:37:49 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31JbnwL024918
 for <perforce@freebsd.org>; Mon, 1 Apr 2013 19:37:49 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 r31JbnGn024915
 for perforce@freebsd.org; Mon, 1 Apr 2013 19:37:49 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 1 Apr 2013 19:37:49 GMT
Message-Id: <201304011937.r31JbnGn024915@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 227285 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, 01 Apr 2013 19:37:49 -0000

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

Change 227285 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 19:37:46

	Rename excessively generically named "flash.c" to "cfi.c" boot2
	and loader.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/Makefile#8 edit
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/cfi.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/flash.c#3 delete
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/Makefile#2 edit

Differences ...

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

@@ -8,7 +8,7 @@
 SRCS=		start.S			\
 		boot2.c			\
 		altera_jtag_uart.c	\
-		flash.c
+		cfi.c
 
 NO_MAN=
 

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

@@ -9,7 +9,7 @@
 
 # Architecture-specific loader code
 SRCS=		start.S main.c exec.c metadata.c vers.c
-SRCS+=		beri_console.c altera_jtag_uart.c beri_disk.c flash.c
+SRCS+=		beri_console.c altera_jtag_uart.c beri_disk.c cfi.c
 
 LOADER_DISK_SUPPORT?=	yes
 LOADER_UFS_SUPPORT?=	yes