PERFORCE change 96288 for review

Warner Losh imp at FreeBSD.org
Fri Apr 28 06:02:19 UTC 2006


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

Change 96288 by imp at 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=
 


More information about the p4-projects mailing list