From owner-p4-projects@FreeBSD.ORG  Fri Aug 11 00:37:30 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 AA00816A4EA; Fri, 11 Aug 2006 00:37:30 +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 8402C16A4DA
	for <perforce@freebsd.org>; Fri, 11 Aug 2006 00:37:30 +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 16E1643D69
	for <perforce@freebsd.org>; Fri, 11 Aug 2006 00:37:30 +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 k7B0bUXO085415
	for <perforce@freebsd.org>; Fri, 11 Aug 2006 00:37:30 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7B0bThK085412
	for perforce@freebsd.org; Fri, 11 Aug 2006 00:37:29 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 11 Aug 2006 00:37:29 GMT
Message-Id: <200608110037.k7B0bThK085412@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 103624 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, 11 Aug 2006 00:37:30 -0000

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

Change 103624 by imp@imp_lighthouse on 2006/08/11 00:36:47

	We don't need to support MMC card booting, so eliminate that from
	the code (ifdef'd)

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#5 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.h#3 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#5 (text+ko) ====

@@ -272,7 +272,6 @@
   
 	return AT91C_WRITE_OK;
 }
-#endif
 
 //*----------------------------------------------------------------------------
 //* \fn    AT91F_MCI_MMC_SelectCard
@@ -306,6 +305,7 @@
     	return AT91C_CARD_SELECTED_OK;
     return AT91C_CARD_SELECTED_ERROR;
 }
+#endif
 
 //*----------------------------------------------------------------------------
 //* \fn    AT91F_MCI_GetCSD
@@ -337,6 +337,7 @@
 	return( AT91F_MCI_SendCommand(AT91C_SET_BLOCKLEN_CMD, length) );
 }
 
+#if 0
 //*----------------------------------------------------------------------------
 //* \fn    AT91F_MCI_MMC_GetAllOCR
 //* \brief Asks to all cards to send their operations conditions
@@ -445,6 +446,7 @@
 	// XXX warner hacked this
 	return AT91C_INIT_OK;
 }
+#endif
 
 //*----------------------------------------------------------------------------
 //* \fn    AT91F_MCI_SDCard_GetOCR

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.h#3 (text+ko) ====

@@ -380,7 +380,9 @@
 AT91S_MCIDeviceStatus 	AT91F_MCI_SetBlocklength(unsigned int);
 AT91S_MCIDeviceStatus 	AT91F_MCI_ReadBlock(AT91PS_MciDevice,int,unsigned int *,int);
 AT91S_MCIDeviceStatus 	AT91F_MCI_WriteBlock(AT91PS_MciDevice,int,unsigned int *,int);
+#if 0
 AT91S_MCIDeviceStatus AT91F_MCI_MMC_Init (AT91PS_MciDevice pMCI_Device);
 AT91S_MCIDeviceStatus AT91F_MCI_MMC_SelectCard(AT91PS_MciDevice pMCI_Device, unsigned int relative_card_address);
+#endif
 
 #endif