PERFORCE change 103619 for review

[Warner Losh]

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

Change 103619 by imp at imp_lighthouse on 2006/08/10 23:54:35

	Move sd support into libat91
	At the same time, use a couple of strategic shifts to avoid
	the need for stormy16-lib2.c entirely.  This save > 1000 bytes!

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/bootsd/Makefile#4 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/lib_AT91RM9200.h#2 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/mci_device.c#4 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/mci_device.h#3 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/sd-card.c#8 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/sd-card.h#2 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/stormy16-lib2.c#2 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#16 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#1 add
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.h#1 add
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#1 add
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.h#1 branch

Differences ...

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

@@ -1,11 +1,11 @@
 #  $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.1 2006/04/19 17:16:48 imp Exp $
 
-.PATH:	${.CURDIR}/../bootspi
+.PATH: ${.CURDIR}/../bootspi
 
 P=bootsd
 FILES=${P}
 SRCS=arm_init.S main.c
-SRCS+=mci_device.c sd-card.c stormy16-lib2.c
+#SRCS+=stormy16-lib2.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#16 (text+ko) ====

@@ -5,7 +5,8 @@
 LIB=		at91
 INTERNALLIB=
 SRCS=at91rm9200_lowlevel.c delay.c eeprom.c emac.c emac_init.c fpga.c getc.c \
-	p_string.c putchar.c printf.c reset.c spi_flash.c xmodem.c
+	p_string.c putchar.c printf.c reset.c spi_flash.c xmodem.c \
+	sd-card.c mci_device.c
 NO_MAN=
 
 .if ${MK_TAG_LIST} != "no"