[U-Boot] [PATCH] ARM:PXA Use new definitions in mmc.h

Tom Rix Tom.Rix at windriver.com
Fri Feb 20 02:53:30 CET 2009


In old code or current u-boot-arm MMC_CMD_WRITE_BLOCK == 24.
In new mmc.h 24 is MMC_CMD_WRITE_SINGLE_BLOCK

Change mmc_read to conform to mmc.h declaration.

Signed-off-by: Tom Rix <Tom.Rix at windriver.com>
---
 cpu/pxa/mmc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpu/pxa/mmc.c b/cpu/pxa/mmc.c
index 8f5277e..f92c089 100644
--- a/cpu/pxa/mmc.c
+++ b/cpu/pxa/mmc.c
@@ -181,7 +181,7 @@ mmc_block_write(ulong dst, uchar * src, int len)
 	MMC_STRPCL = MMC_STRPCL_STOP_CLK;
 	MMC_NOB = 1;
 	MMC_BLKLEN = len;
-	mmc_cmd(MMC_CMD_WRITE_BLOCK, argh, argl,
+	mmc_cmd(MMC_CMD_WRITE_SINGLE_BLOCK, argh, argl,
 		MMC_CMDAT_R1 | MMC_CMDAT_WRITE | MMC_CMDAT_BLOCK |
 		MMC_CMDAT_DATA_EN);
 
@@ -218,7 +218,7 @@ mmc_block_write(ulong dst, uchar * src, int len)
 
 int
 /****************************************************/
-mmc_read(ulong src, uchar * dst, int size)
+mmc_read(struct mmc *mmc, u64 src, uchar * dst, int size)
 /****************************************************/
 {
 	ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
@@ -383,7 +383,7 @@ mmc_bread(int dev_num, ulong blknr, lbaint_t blkcnt, void *dst)
 	int mmc_block_size = MMC_BLOCK_SIZE;
 	ulong src = blknr * mmc_block_size + CONFIG_SYS_MMC_BASE;
 
-	mmc_read(src, (uchar *) dst, blkcnt * mmc_block_size);
+	mmc_read(NULL, src, (uchar *) dst, blkcnt * mmc_block_size);
 	return blkcnt;
 }
 
-- 
1.6.0.5



More information about the U-Boot mailing list