From owner-p4-projects@FreeBSD.ORG  Thu Apr 20 20:09:48 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 DE2AD16A408; Thu, 20 Apr 2006 20:09:47 +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 BB29916A406
	for <perforce@freebsd.org>; Thu, 20 Apr 2006 20:09:47 +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 CAA2443D6D
	for <perforce@freebsd.org>; Thu, 20 Apr 2006 20:09:44 +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 k3KK9iPb052685
	for <perforce@freebsd.org>; Thu, 20 Apr 2006 20:09:44 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KK9iSh052682
	for perforce@freebsd.org; Thu, 20 Apr 2006 20:09:44 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 20 Apr 2006 20:09:44 GMT
Message-Id: <200604202009.k3KK9iSh052682@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 95711 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, 20 Apr 2006 20:09:48 -0000

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

Change 95711 by imp@imp_hammer on 2006/04/20 20:08:56

	revert back to directly calling the loaded program.  This gets us
	back down below 1k (992 bytes).

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot0/Makefile#8 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0/main.c#9 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/boot0/Makefile#8 (text) ====

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

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

@@ -28,15 +28,16 @@
 #include "lib.h"
 #include "at91rm9200_lowlevel.h"
 
-extern void doit(void *);
+typedef void fn_t(void);
 
 int
 main(void)
 {
 	char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */
+	fn_t *fn = (fn_t *)(SDRAM_BASE + (1 << 20)); /* Load to base + 1MB */
 
 	while (xmodem_rx(addr) == -1)
 		continue;
-	doit(addr);
-	return (1);
+	fn();
+	return (0);
 }