From owner-p4-projects@FreeBSD.ORG  Mon Apr  1 16:13:04 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 07770961; Mon,  1 Apr 2013 16:13:04 +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 BF12995F
 for <perforce@freebsd.org>; Mon,  1 Apr 2013 16:13:03 +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 AE7E368
 for <perforce@freebsd.org>; Mon,  1 Apr 2013 16:13:03 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31GD3Gk002890
 for <perforce@freebsd.org>; Mon, 1 Apr 2013 16:13:03 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 r31GD32R002887
 for perforce@freebsd.org; Mon, 1 Apr 2013 16:13:03 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 1 Apr 2013 16:13:03 GMT
Message-Id: <201304011613.r31GD32R002887@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 227275 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 16:13:04 -0000

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

Change 227275 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 16:12:20

	The actual target is 'boot2', a binary file to be stuffed in ROM
	or flash, rather than the ELF file, so rearrange targets to reflect
	this.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/Makefile#7 edit

Differences ...

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

@@ -1,6 +1,6 @@
 #  $FreeBSD$
 
-PROG=		boot2
+PROG=		boot2.elf
 BINDIR?=	/boot
 INSTALLFLAGS=	-b
 
@@ -33,12 +33,14 @@
 .PATH:		${.CURDIR}/../common
 CFLAGS+=	-I${.CURDIR}/../common
 
-boot2: linker.cfg
+boot2.elf: linker.cfg
+
+boot2: boot2.elf
+	objcopy -S -O binary boot2.elf boot2
 
-boot2.img: boot2
-	objcopy -S -O binary boot2 boot2.img
+boot2.dump: boot2.elf
+	objdump -dS boot2.elf > boot2.dump
 
-boot2.dump: boot2
-	objdump -dS boot2 > boot2.dump
+all: boot2 boot2.dump
 
 .include <bsd.prog.mk>