From owner-p4-projects@FreeBSD.ORG  Wed Nov  8 00:25:12 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 E66EA16A4C2; Wed,  8 Nov 2006 00:25:11 +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 C25BD16A49E
	for <perforce@freebsd.org>; Wed,  8 Nov 2006 00:25:11 +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 65FBB43D5E
	for <perforce@freebsd.org>; Wed,  8 Nov 2006 00:25:03 +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 kA80P0m3091129
	for <perforce@freebsd.org>; Wed, 8 Nov 2006 00:25:00 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA80Oxpj091126
	for perforce@freebsd.org; Wed, 8 Nov 2006 00:24:59 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 8 Nov 2006 00:24:59 GMT
Message-Id: <200611080024.kA80Oxpj091126@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 109498 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, 08 Nov 2006 00:25:12 -0000

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

Change 109498 by imp@imp_lighthouse on 2006/11/08 00:24:17

	We don't need the table in arm_init.S.  This saves about 300 bytes
	in boot2.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#15 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#11 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/table.S#1 add

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#15 (text+ko) ====

@@ -2,7 +2,7 @@
 
 P=bootspi
 FILES=${P}
-SRCS=arm_init.S main.c loader_prompt.c env_vars.c ee.c
+SRCS=arm_init.S main.c loader_prompt.c env_vars.c ee.c table.S
 NO_MAN=
 LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}

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

@@ -99,31 +99,3 @@
 
 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 "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                           "
-#else
-	.string "m 42 53 44 0 0 1"
-	.string "k 0x20000000"
-	.string "e 0x20000000"
-#endif
-	.word	0
-#endif