PERFORCE change 95451 for review

Warner Losh imp at FreeBSD.org
Mon Apr 17 21:31:36 UTC 2006


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

Change 95451 by imp at 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


More information about the p4-projects mailing list