From owner-p4-projects@FreeBSD.ORG  Fri Apr 28 06:02:19 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 0D80516A402; Fri, 28 Apr 2006 06:02:19 +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 E214B16A401
	for <perforce@freebsd.org>; Fri, 28 Apr 2006 06:02:18 +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 ACDDA43D48
	for <perforce@freebsd.org>; Fri, 28 Apr 2006 06:02:18 +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 k3S62IOU018792
	for <perforce@freebsd.org>; Fri, 28 Apr 2006 06:02:18 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3S62I2E018784
	for perforce@freebsd.org; Fri, 28 Apr 2006 06:02:18 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 28 Apr 2006 06:02:18 GMT
Message-Id: <200604280602.k3S62I2E018784@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 96288 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: Fri, 28 Apr 2006 06:02:19 -0000

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

Change 96288 by imp@imp_hammer on 2006/04/28 06:02:00

	Looks a lot like we're going to have different versions of the
	loader_prompt.c code for iic and spi versions of the boot loader,
	so copy the file there.  This is sub-optimal from a code sharing
	perspective, but necessary for size reasons.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#14 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#9 branch
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#5 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#11 edit

Differences ...

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

@@ -2,7 +2,7 @@
 
 P=bootiic
 FILES=${P}
-SRCS=arm_init.S main.c
+SRCS=arm_init.S main.c loader_prompt.c
 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/Makefile#5 (text+ko) ====

@@ -2,7 +2,7 @@
 
 P=bootspi
 FILES=${P}
-SRCS=arm_init.s main.c
+SRCS=arm_init.s main.c loader_prompt.c
 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/libat91/Makefile#11 (text+ko) ====

@@ -4,7 +4,7 @@
 
 LIB=		at91
 INTERNALLIB=
-SRCS=at91rm9200_lowlevel.c eeprom.c emac.c env_vars.c getc.c loader_prompt.c \
+SRCS=at91rm9200_lowlevel.c eeprom.c emac.c env_vars.c getc.c \
 	p_string.c putchar.c printf.c reset.c spi_flash.c xmodem.c
 NO_MAN=