MFp4:

Tidy up a bit.  Make sure that the burned image matches the downloaded
one.

3 files changed, 23 insertions, 41 deletions

diff --git a/sys/boot/arm/at91/boot0spi/Makefile b/sys/boot/arm/at91/boot0spi/Makefile
index b2072c3..0e196cf 100644
--- a/sys/boot/arm/at91/boot0spi/Makefile
+++ b/sys/boot/arm/at91/boot0spi/Makefile
@@ -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}
diff --git a/sys/boot/arm/at91/boot0spi/doit.c b/sys/boot/arm/at91/boot0spi/doit.c
deleted file mode 100644
index a878ef4..0000000
--- a/sys/boot/arm/at91/boot0spi/doit.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2006 M. Warner Losh.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-typedef void fn_t(void);
-
-void doit(void *);
-
-void
-doit(void *addr)
-{
-    fn_t *fn = (fn_t *)addr;
-    fn();
-}
-
diff --git a/sys/boot/arm/at91/boot0spi/main.c b/sys/boot/arm/at91/boot0spi/main.c
index cc3fb25..5404773 100644
--- a/sys/boot/arm/at91/boot0spi/main.c
+++ b/sys/boot/arm/at91/boot0spi/main.c
@@ -27,16 +27,35 @@
 #include "at91rm9200.h"
 #include "lib.h"
 #include "at91rm9200_lowlevel.h"
+#include "spi_flash.h"
 
-extern void doit(void *);
+#define OFFSET 0
 
 int
 main(void)
 {
+	int len, i, j, off;
 	char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */
+	char *addr2 = (char *)SDRAM_BASE + (2 << 20); /* Load to base + 2MB */
+	char *addr3 = (char *)SDRAM_BASE + (3 << 20); /* Load to base + 2MB */
 
-	while (xmodem_rx(addr) == -1)
+	SPI_InitFlash();
+	printf("Waiting for data\r\n");
+	while ((len = xmodem_rx(addr)) == -1)
 		continue;
-	doit(addr);
+	printf("\r\nDownloaded %u bytes.\r\n", len);
+	p_memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE);
+	printf("Writing %u bytes to flash at %u\r\n", len, OFFSET);
+	for (i = 0; i < len; i+= FLASH_PAGE_SIZE) {
+		for (j = 0; j < 10; j++) {
+			off = i + OFFSET;
+			SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE);
+			SPI_ReadFlash(off, addr2 + i, FLASH_PAGE_SIZE);
+			if (p_memcmp(addr3 + i, addr2 + i, FLASH_PAGE_SIZE) == 0)
+				break;
+		}
+		if (j >= 10)
+			printf("Bad Readback at %u\r\n", i);
+	}
 	return (1);
 }