From owner-p4-projects@FreeBSD.ORG  Mon May  1 17:34:58 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 C1CED16A443; Mon,  1 May 2006 17:34:57 +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 9E3C816A401
	for <perforce@freebsd.org>; Mon,  1 May 2006 17:34:56 +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 EE47843D6E
	for <perforce@freebsd.org>; Mon,  1 May 2006 17:34:52 +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 k41HYqNp027792
	for <perforce@freebsd.org>; Mon, 1 May 2006 17:34:52 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41HYqLE027786
	for perforce@freebsd.org; Mon, 1 May 2006 17:34:52 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 1 May 2006 17:34:52 GMT
Message-Id: <200605011734.k41HYqLE027786@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 96498 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: Mon, 01 May 2006 17:34:59 -0000

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

Change 96498 by imp@imp_hammer on 2006/05/01 17:34:07

	For interrupt vector 6, use the format needed by the boot
	loader in the AT91RM9200 when booting off of DataFlash parts.
	
	# NOTE: This needs to be tweaked for each part that might have
	# on the SPI bus, as we have to encode page size and number of
	# pages into this vector...  On the other hand, we'll have this
	# data once the boot loader is in memory and can pass it to the
	# kernel in some manner...

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#2 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#2 (text+ko) ====

@@ -23,7 +23,6 @@
  * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.s,v 1.1 2006/04/19 17:16:48 imp Exp $
  ******************************************************************************/
 
-	.equ	TWI_EEPROM_SIZE,	0x2000
 	.equ	ARM_MODE_USER,	0x10
 	.equ	ARM_MODE_FIQ,	0x11
 	.equ	ARM_MODE_IRQ,	0x12
@@ -60,7 +59,7 @@
 dabtvec:
                 B           dabtvec         	@; Data Abort
 rsvdvec:
-		.long	(TWI_EEPROM_SIZE >> 9)
+		.long	((1056 << 17) | (13 << 13) | (12 * 1024))
 irqvec:
                 ldr         pc, [pc,#-0xF20]    @; IRQ : read the AIC
 fiqvec: