From owner-p4-projects@FreeBSD.ORG  Wed May  3 19:39:03 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 98B1316A474; Wed,  3 May 2006 19:39:03 +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 76EAB16A448
	for <perforce@freebsd.org>; Wed,  3 May 2006 19:39:03 +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 4B6F343D6D
	for <perforce@freebsd.org>; Wed,  3 May 2006 19:38:53 +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 k43JcrUf095011
	for <perforce@freebsd.org>; Wed, 3 May 2006 19:38:53 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43Jcqih095003
	for perforce@freebsd.org; Wed, 3 May 2006 19:38:52 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 3 May 2006 19:38:52 GMT
Message-Id: <200605031938.k43Jcqih095003@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 96609 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 19:39:04 -0000

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

Change 96609 by imp@imp_hammer on 2006/05/03 19:38:50

	Support FreeBSD booting as well as Linux.
	load 12 * 2 512 byte pages, not 12 * 1024 512 byte pages...

Affected files ...

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

Differences ...

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

@@ -59,7 +59,7 @@
 dabtvec:
                 B           dabtvec         	@; Data Abort
 rsvdvec:
-		.long	((1056 << 17) | (13 << 13) | (12 * 1024))
+		.long	((1056 << 17) | (13 << 13) | (12 * 2))
 irqvec:
                 ldr         pc, [pc,#-0xF20]    @; IRQ : read the AIC
 fiqvec:
@@ -101,9 +101,18 @@
 
 	.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
+	.string "Bootloader for KB9202 Evaluation Board."
+	.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                           "
+#endif