PERFORCE change 109585 for review

[Warner Losh]

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

Change 109585 by imp at imp_lighthouse on 2006/11/09 00:45:36

	Finish making this work for either TSC's board or the kb920x.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#9 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#26 edit

Differences ...

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

@@ -1,16 +1,22 @@
 #  $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.1 2006/04/19 17:16:48 imp Exp $
 
-.PATH: ${.CURDIR}/../bootspi
+.PATH: ${.CURDIR}/../libat91
 
 P=boot2
 FILES=${P}
-SRCS=arm_init.S boot2.c ${BOOT_FLAVOR}_board.c ee.c
+SRCS=arm_init.S boot2.c ${BOOT_FLAVOR}_board.c
 NO_MAN=
 LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
 
 .include <bsd.prog.mk>
 
+.if ${BOOT_FLAVOR} == "tsc"
+SRCS+=ee.c
+.endif
+.if ${BOOT_FLAVOR} == "kb920x"
+CFLAGS+=-DBOOT_IIC
+.endif
 CFLAGS+= \
 	-I${.CURDIR}/../bootspi \
 	-I${.CURDIR}/../../../common \

==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#26 (text+ko) ====

@@ -148,7 +148,6 @@
     int autoboot, c = 0;
     ino_t ino;
 
-printf("MAIN\n");
     board_init();
     EMAC_Init();
     sdcard_init();