From owner-p4-projects@FreeBSD.ORG  Mon Apr 17 21:31:36 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 9A25D16A401; Mon, 17 Apr 2006 21:31:36 +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 A9C9816A404
	for <perforce@freebsd.org>; Mon, 17 Apr 2006 21:31:35 +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 7337243D46
	for <perforce@freebsd.org>; Mon, 17 Apr 2006 21:31:35 +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 k3HLVZKB081938
	for <perforce@freebsd.org>; Mon, 17 Apr 2006 21:31:35 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3HLVZAu081930
	for perforce@freebsd.org; Mon, 17 Apr 2006 21:31:35 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 17 Apr 2006 21:31:35 GMT
Message-Id: <200604172131.k3HLVZAu081930@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 95451 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:31:36 -0000

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

Change 95451 by imp@imp_hammer on 2006/04/17 21:31:34

	Retire xmodem.h.  Move it into lib.h since xmodem.h lives in libat91.a
	now.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#2 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#4 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#2 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/xmodem.h#2 delete

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#2 (text+ko) ====

@@ -6,6 +6,7 @@
 
 LIBAT91=${.OBJDIR}/../libat91/libat91.a
 
+.if defined(P)
 ${P}:	${P}.out
 	objcopy -S -O binary ${P}.out ${.TARGET}
 
@@ -13,3 +14,4 @@
 	ld ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LIBAT91}
 
 CLEANFILES+= ${P} ${P}.out
+.endif

==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#4 (text+ko) ====

@@ -23,7 +23,6 @@
 #include "debug_io.h"
 #include "at91rm9200_lowlevel.h"
 #include "p_string.h"
-#include "xmodem.h"
 #include "eeprom.h"
 #ifdef SUPPORT_TAG_LIST
 #include "tag_list.h"

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#2 (text) ====

@@ -29,5 +29,6 @@
 
 int getc(int);
 void putc(int);
+int xmodem_rx(char *dst);
 
 #endif