PERFORCE change 95446 for review

[Warner Losh]

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

Change 95446 by imp at imp_hammer on 2006/04/17 21:18:10

	More rearrangement and migration towards libat91

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot0/Makefile#4 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#7 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h#2 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0/lib.c#3 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0/lib.h#2 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0/xmodem.c#2 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0/xmodem.h#2 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#4 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.c#1 branch
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#1 branch
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/xmodem.h#1 branch

Differences ...

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

@@ -1,22 +1,23 @@
 #  $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.2 2006/04/13 17:44:05 imp Exp $
 
-PROG=boot0
-SRCS=arm_init.s at91rm9200_lowlevel.c lib.c main.c xmodem.c
+P=boot0
+FILES=${P}
+SRCS=arm_init.s main.c
 NO_MAN=
 LDFLAGS=-e 0 -T linker.cfg
-CFLAGS=-O2 -mcpu=arm9 -ffreestanding -I${.CURDIR}/../libat91
 CFLAGS+=-DBOOT0_KB9202
 #CFLAGS+=-DBOOT0_TSC
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
-CLEANFILES=${OBJS} ${PROG} ${PROG}.out
+
+.include <bsd.init.mk>
+
+${P}:	${P}.out
+	objcopy -S -O binary ${P}.out ${.TARGET}
 
-all:	${PROG}
+${P}.out: ${OBJS}
+	ld ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LIBAT91}
 
-${PROG}:	${PROG}.out ${OBJS}
-	objcopy -S -O binary ${PROG}.out ${PROG}
+CLEANFILES+= ${P} ${P}.out
 
-${PROG}.out: ${OBJS}
-	ld ${LDFLAGS} -o ${PROG}.out ${OBJS}
+.include <bsd.prog.mk>
 
-clean:
-	rm -f ${CLEANFILES}

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

@@ -1,24 +1,20 @@
 #  $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.1 2006/04/12 21:22:44 imp Exp $
 
-.PATH:	${.CURDIR}/../boot0
-
-PROG=bootiic
-SRCS=arm_init.s at91rm9200_lowlevel.c lib.c main.c xmodem.c eeprom.c \
+P=bootiic
+SRCS=arm_init.s main.c xmodem.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
-CFLAGS=-O2 -mcpu=arm9 -ffreestanding -I${.CURDIR}/../libat91 -I${.CURDIR}/../boot0
-CFLAGS+=-DBOOT0_KB9202
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
-CLEANFILES=${OBJS} ${PROG} ${PROG}.out
+
 
-all:	${PROG}
+all:	${P}
 
-${PROG}:	${PROG}.out ${OBJS}
-	objcopy -S -O binary ${PROG}.out ${PROG}
+${P}:	${P}.out ${OBJS}
+	objcopy -S -O binary ${P}.out ${P}
 
-${PROG}.out: ${OBJS}
-	ld ${LDFLAGS} -o ${PROG}.out ${OBJS}
+${P}.out: ${OBJS}
+	ld ${LDFLAGS} -o ${P}.out ${OBJS}
 
 clean:
 	rm -f ${CLEANFILES}