MFp4:

Simplify life a little for such a simple program.

3 files changed, 5 insertions, 48 deletions

diff --git a/sys/boot/arm/at91/boot0iic/Makefile b/sys/boot/arm/at91/boot0iic/Makefile
index 4da1388..503c98c 100644
--- a/sys/boot/arm/at91/boot0iic/Makefile
+++ b/sys/boot/arm/at91/boot0iic/Makefile
@@ -4,7 +4,7 @@
 
 P=boot0iic
 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/boot0iic/doit.c b/sys/boot/arm/at91/boot0iic/doit.c
deleted file mode 100644
index 6a3fdaf..0000000
--- a/sys/boot/arm/at91/boot0iic/doit.c
+++ /dev/null
@@ -1,44 +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$
- */
-
-#include "lib.h"
-#include "at91rm9200.h"
-#include "at91rm9200_lowlevel.h"
-
-typedef void fn_t(void);
-void doit(void *);
-
-void
-doit(void *addr)
-{
-	int sec;
-
-	InitEEPROM();
-	printf("Writing EEPROM from 0x%x to addr 0\r\n", addr);
-	WriteEEPROM(0, addr, 8192);
-	sec = GetSeconds();
-	printf("Write complete.  Press reset\r\n");
-}
diff --git a/sys/boot/arm/at91/boot0iic/main.c b/sys/boot/arm/at91/boot0iic/main.c
index cc3fb25..2faeaf2 100644
--- a/sys/boot/arm/at91/boot0iic/main.c
+++ b/sys/boot/arm/at91/boot0iic/main.c
@@ -28,8 +28,6 @@
 #include "lib.h"
 #include "at91rm9200_lowlevel.h"
 
-extern void doit(void *);
-
 int
 main(void)
 {
@@ -37,6 +35,9 @@ main(void)
 
 	while (xmodem_rx(addr) == -1)
 		continue;
-	doit(addr);
+	InitEEPROM();
+	printf("Writing EEPROM from 0x%x to addr 0\r\n", addr);
+	WriteEEPROM(0, addr, 8192);
+	printf("Write complete.  Press reset\r\n");
 	return (1);
 }