r1293 - trunk/src/target/u-boot/patches
werner at sita.openmoko.org
werner at sita.openmoko.org
Fri Mar 9 01:13:53 CET 2007
Author: werner
Date: 2007-03-09 01:13:48 +0100 (Fri, 09 Mar 2007)
New Revision: 1293
Modified:
trunk/src/target/u-boot/patches/mmc-fixes.patch
Log:
cpu/arm920t/s3c24x0/mmc.c (mmc_bread): don't need to cast "dst" anymore when
passing to mmc_read (was missing in earlier commit)
cpu/arm920t/s3c24x0/mmc.c (mmc_init): added casts to suppress warnings when
using an "unsigned char *" buffer in sprintf
Modified: trunk/src/target/u-boot/patches/mmc-fixes.patch
===================================================================
--- trunk/src/target/u-boot/patches/mmc-fixes.patch 2007-03-09 00:11:33 UTC (rev 1292)
+++ trunk/src/target/u-boot/patches/mmc-fixes.patch 2007-03-09 00:13:48 UTC (rev 1293)
@@ -20,7 +20,7 @@
dcon |= S3C2410_SDIDCON_BLOCKMODE;
dcon |= S3C2410_SDIDCON_RXAFTERCMD|S3C2410_SDIDCON_XFER_RXSTART;
if (wide)
-@@ -309,7 +307,7 @@ int mmc_write(uchar *src, ulong dst, int
+@@ -309,16 +307,18 @@ int mmc_write(uchar *src, ulong dst, int
return 0;
}
@@ -29,7 +29,9 @@
{
int mmc_block_size = MMC_BLOCK_SIZE;
ulong src = blknr * mmc_block_size + CFG_MMC_BASE;
-@@ -318,7 +316,9 @@ ulong mmc_bread(int dev_num, ulong blknr
+
+- mmc_read(src, (uchar *)dst, blkcnt*mmc_block_size);
++ mmc_read(src, dst, blkcnt*mmc_block_size);
return blkcnt;
}
@@ -129,12 +131,12 @@
+
+ if (verbose)
+ print_mmc_cid(cid);
-+ sprintf(mmc_dev.vendor,
++ sprintf((char *) mmc_dev.vendor,
+ "Man %02x%02x%02x Snr %02x%02x%02x",
+ cid->id[0], cid->id[1], cid->id[2],
+ cid->sn[0], cid->sn[1], cid->sn[2]);
-+ sprintf(mmc_dev.product,"%s",cid->name);
-+ sprintf(mmc_dev.revision,"%x %x",
++ sprintf((char *) mmc_dev.product,"%s",cid->name);
++ sprintf((char *) mmc_dev.revision,"%x %x",
+ cid->hwrev, cid->fwrev);
+ }
+ else {
More information about the commitlog
mailing list