From owner-p4-projects@FreeBSD.ORG  Fri Apr 21 22:13:11 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 0E37016A46B; Fri, 21 Apr 2006 22:13:11 +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 C7C1616A433
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 22:13:10 +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 902D143D45
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 22:13:10 +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 k3LMDAJi027377
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 22:13:10 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3LMDA0g027371
	for perforce@freebsd.org; Fri, 21 Apr 2006 22:13:10 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 21 Apr 2006 22:13:10 GMT
Message-Id: <200604212213.k3LMDA0g027371@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 95838 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: Fri, 21 Apr 2006 22:13:11 -0000

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

Change 95838 by imp@imp_hammer on 2006/04/21 22:12:37

	Initial version of spi burning bootstrap.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#5 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/doit.c#3 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#3 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#5 (text) ====

@@ -4,7 +4,7 @@
 
 P=boot0spi
 FILES=${P}
-SRCS=arm_init.s main.c doit.c
+SRCS=arm_init.s main.c
 NO_MAN=
 LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}

==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#3 (text) ====

@@ -27,16 +27,18 @@
 #include "at91rm9200.h"
 #include "lib.h"
 #include "at91rm9200_lowlevel.h"
-
-extern void doit(void *);
+#include "spi_flash.h"
 
 int
 main(void)
 {
 	char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */
+	int len;
 
-	while (xmodem_rx(addr) == -1)
+	while ((len = xmodem_rx(addr)) == -1)
 		continue;
-	doit(addr);
+	SPI_InitFlash();
+	SPI_WriteFlash(FLASH_PAGE_SIZE, addr, len);
+
 	return (1);
 }