From owner-p4-projects@FreeBSD.ORG  Thu Aug 10 23:55:36 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 6BEFF16A4E5; Thu, 10 Aug 2006 23:55:36 +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 2FF8E16A4DF
	for <perforce@freebsd.org>; Thu, 10 Aug 2006 23:55:36 +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 D105C43D45
	for <perforce@freebsd.org>; Thu, 10 Aug 2006 23:55:35 +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 k7ANtZXU081073
	for <perforce@freebsd.org>; Thu, 10 Aug 2006 23:55:35 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7ANtZho081070
	for perforce@freebsd.org; Thu, 10 Aug 2006 23:55:35 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 10 Aug 2006 23:55:35 GMT
Message-Id: <200608102355.k7ANtZho081070@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 103619 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: Thu, 10 Aug 2006 23:55:36 -0000

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

Change 103619 by imp@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"