From owner-p4-projects@FreeBSD.ORG  Thu Nov  9 00:41:50 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 8A6FF16A576; Thu,  9 Nov 2006 00:41:50 +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 688AA16A412
	for <perforce@freebsd.org>; Thu,  9 Nov 2006 00:41:50 +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 C379B43D62
	for <perforce@freebsd.org>; Thu,  9 Nov 2006 00:41:49 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA90fnwS016160
	for <perforce@freebsd.org>; Thu, 9 Nov 2006 00:41:49 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA90fn6Z016157
	for perforce@freebsd.org; Thu, 9 Nov 2006 00:41:49 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 9 Nov 2006 00:41:49 GMT
Message-Id: <200611090041.kA90fn6Z016157@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 109580 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, 09 Nov 2006 00:41:50 -0000

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

Change 109580 by imp@imp_lighthouse on 2006/11/09 00:41:31

	Complete merge

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/arm_init.S#7 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#12 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/arm_init.S#2 edit

Differences ...

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

@@ -23,6 +23,7 @@
  * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.S,v 1.3 2006/10/21 22:44:26 imp Exp $
  ******************************************************************************/
 
+	.equ	TWI_EEPROM_SIZE,	0x2000
 	.equ	ARM_MODE_USER,	0x10
 	.equ	ARM_MODE_FIQ,	0x11
 	.equ	ARM_MODE_IRQ,	0x12
@@ -60,7 +61,7 @@
                 B           dabtvec         	@; Data Abort
 rsvdvec:
 #ifdef BOOT_IIC
-		.long	12 << 10		@; 12k from iic part
+		.long	(TWI_EEPROM_SIZE >> 9)
 #else
 		.long	((1056 << 17) | (13 << 13) | (12 * 2))
 #endif
@@ -99,3 +100,30 @@
 
 infiniteLoop:
 	b	infiniteLoop
+
+/* the following section is used to store boot commands in 	*/
+/*  non-volatile memory.					*/
+
+	.global BootCommandSection
+BootCommandSection:
+#ifdef SUPPORT_LINUX
+	.string "Bootloader for KB9202 Evaluation Board."
+	.string "c 0x20210000 0x10100000 0x80000        "
+	.string "m 0 0 0 0 0 0                          "
+	.string "t 0x20000100 console=ttyS0,115200 root=/dev/ram rw initrd=0x20210000,654933"
+	.string "e 0x10000000                           "
+	.string "                 "
+#else
+#if 1
+	.string "m 42 53 44 0 0 1"
+	.string "ip 206 168 13 194"
+	.string "server_ip 206 168 13 207"
+	.string "tftp 0x20000000 kernel.bin"
+	.string "e 0x20000000"
+#else
+	.string "m 42 53 44 0 0 1"
+	.string "k 0x20000000"
+	.string "e 0x20000000"
+#endif
+	.word	0
+#endif