From owner-p4-projects@FreeBSD.ORG  Mon Apr 17 21:27:33 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D94A116A405; Mon, 17 Apr 2006 21:27:32 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A0F4116A402
	for <perforce@freebsd.org>; Mon, 17 Apr 2006 21:27:32 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 37CC043D49
	for <perforce@freebsd.org>; Mon, 17 Apr 2006 21:27:29 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3HLRTu5080539
	for <perforce@freebsd.org>; Mon, 17 Apr 2006 21:27:29 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3HLRS2C080536
	for perforce@freebsd.org; Mon, 17 Apr 2006 21:27:28 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 17 Apr 2006 21:27:28 GMT
Message-Id: <200604172127.k3HLRS2C080536@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95448 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Mon, 17 Apr 2006 21:27:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=95448

Change 95448 by imp@imp_hammer on 2006/04/17 21:27:17

	boot0 and bootiic should now build in new world order.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#1 add
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0/Makefile#5 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#5 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/boot0/Makefile#5 (text) ====

@@ -5,19 +5,7 @@
 SRCS=arm_init.s main.c
 NO_MAN=
 LDFLAGS=-e 0 -T linker.cfg
-CFLAGS+=-DBOOT0_KB9202
-#CFLAGS+=-DBOOT0_TSC
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
 
-.include <bsd.init.mk>
-
-${P}:	${P}.out
-	objcopy -S -O binary ${P}.out ${.TARGET}
-
-${P}.out: ${OBJS}
-	ld ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LIBAT91}
-
-CLEANFILES+= ${P} ${P}.out
-
 .include <bsd.prog.mk>
 

==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#5 (text+ko) ====

@@ -1,20 +1,11 @@
 #  $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.1 2006/04/12 21:22:44 imp Exp $
 
 P=bootiic
-SRCS=arm_init.s main.c xmodem.c eeprom.c \
+FILES=${P}
+SRCS=arm_init.s main.c eeprom.c \
 	env_vars.c debug_io.c loader_prompt.c p_string.c emac.c
 NO_MAN=
 LDFLAGS=-e 0 -T linker.cfg
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
 
-
-all:	${P}
-
-${P}:	${P}.out ${OBJS}
-	objcopy -S -O binary ${P}.out ${P}
-
-${P}.out: ${OBJS}
-	ld ${LDFLAGS} -o ${P}.out ${OBJS}
-
-clean:
-	rm -f ${CLEANFILES}
+.include <bsd.prog.mk>