From owner-p4-projects@FreeBSD.ORG  Thu Nov  9 00:45:59 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 3289616A415; Thu,  9 Nov 2006 00:45:59 +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 9A2C316A40F
	for <perforce@freebsd.org>; Thu,  9 Nov 2006 00:45:58 +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 3B04F43D58
	for <perforce@freebsd.org>; Thu,  9 Nov 2006 00:45:58 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA90jwp7017018
	for <perforce@freebsd.org>; Thu, 9 Nov 2006 00:45:58 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA90jvVV017015
	for perforce@freebsd.org; Thu, 9 Nov 2006 00:45:57 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 9 Nov 2006 00:45:57 GMT
Message-Id: <200611090045.kA90jvVV017015@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 109585 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: Thu, 09 Nov 2006 00:45:59 -0000

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

Change 109585 by imp@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();