From owner-p4-projects@FreeBSD.ORG  Wed May  3 22:17:28 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 5831A16A422; Wed,  3 May 2006 22:17:28 +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 36F1F16A420
	for <perforce@freebsd.org>; Wed,  3 May 2006 22:17:28 +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 03DA243D45
	for <perforce@freebsd.org>; Wed,  3 May 2006 22:17:28 +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 k43MHRrS094019
	for <perforce@freebsd.org>; Wed, 3 May 2006 22:17:27 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43MHRTo094012
	for perforce@freebsd.org; Wed, 3 May 2006 22:17:27 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 3 May 2006 22:17:27 GMT
Message-Id: <200605032217.k43MHRTo094012@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 96623 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: Wed, 03 May 2006 22:17:28 -0000

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

Change 96623 by imp@imp_hammer on 2006/05/03 22:16:31

	Always init spi flash
	move autoboot message to where we do the automatic boot...

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#6 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#6 (text+ko) ====

@@ -40,11 +40,11 @@
 #include "loader_prompt.h"
 #include "emac.h"
 #include "lib.h"
+#include "spi_flash.h"
 #ifdef TSC_FPGA
-#include "spi_flash.h"
 #include "fpga.h"
 
-struct fpga main_fpga = 
+const struct fpga main_fpga = 
 {
     AT91C_BASE_PIOB, AT91C_PIO_PB0,
     AT91C_BASE_PIOC, AT91C_PIO_PC11,
@@ -58,7 +58,6 @@
 	int len;
 	char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */
 
-	SPI_InitFlash();
 	len = 212482;
 	SPI_ReadFlash(15 * FLASH_PAGE_SIZE, addr, len);
 	printf("Loading %u bytes into the FPGA...\r\n", len);
@@ -72,12 +71,13 @@
 int
 main(void)
 {
+	SPI_InitFlash();
 #ifdef TSC_FPGA
 	fpga_load();
 #endif
 	EMAC_Init();
 	LoadBootCommands();
-	printf("\r\nSPI Boot loader.\r\nAutoboot...\r\n");
+	printf("\r\nSPI Boot loader.\r\n");
 	if (getc(1) == -1)
 		ExecuteEnvironmentFunctions();
 	Bootloader(0);