diff options
| author | Sammy He <r62914@freescale.com> | 2011-01-26 23:03:31 +0800 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2012-09-05 14:57:39 -0400 |
| commit | bda6031cf24819487a22f8c13704896924028e7e (patch) | |
| tree | 98e4e3ee1668a64fdc37e63022500aa8da1db1b0 /common | |
| parent | 4d9934126c273b83f55888b5403b247e1a72bb62 (diff) | |
ENGR00138422-3 Android fastboot: Pass block offset to cmd_fastboot
Pass mmc/sata block offset from fastboot driver to cmd_fastboot, not byte.
Signed-off-by: Sammy He <r62914@freescale.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_fastboot.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/common/cmd_fastboot.c b/common/cmd_fastboot.c index e3eb5903b9..cf51b3a378 100644 --- a/common/cmd_fastboot.c +++ b/common/cmd_fastboot.c @@ -110,8 +110,7 @@ static unsigned int mmc_controller_no; /* To support the Android-style naming of flash */ #define MAX_PTN 16 -#define MMC_BLOCK_SIZE 512 -#define SATA_BLOCK_SIZE 512 +#define MMC_SATA_BLOCK_SIZE 512 static fastboot_ptentry ptable[MAX_PTN]; static unsigned int pcount; @@ -1116,7 +1115,8 @@ static int rx_handler (const unsigned char *buffer, unsigned int buffer_size) if (ptn == 0) { printf("Partition:'%s' does not exist\n", ptn->name); sprintf(response, "FAILpartition does not exist"); - } else if ((download_bytes > ptn->length) && + } else if ((download_bytes > + ptn->length * MMC_SATA_BLOCK_SIZE) && !(ptn->flags & FASTBOOT_PTENTRY_FLAGS_WRITE_ENV)) { printf("Image too large for the partition\n"); sprintf(response, "FAILimage too large for partition"); @@ -1164,13 +1164,12 @@ static int rx_handler (const unsigned char *buffer, unsigned int buffer_size) sprintf(source, "0x%x", interface.transfer_buffer); - /* block offset */ - temp = ptn->start / SATA_BLOCK_SIZE; - sprintf(dest, "0x%x", temp); + /* block offset */ + sprintf(dest, "0x%x", ptn->start); /* block count */ temp = (download_bytes + - SATA_BLOCK_SIZE - 1) / - SATA_BLOCK_SIZE; + MMC_SATA_BLOCK_SIZE - 1) / + MMC_SATA_BLOCK_SIZE; sprintf(length, "0x%x", temp); if (do_sata(NULL, 0, 5, sata_write)) { printf("Writing '%s' FAILED!\n", @@ -1210,12 +1209,11 @@ mmc_ops: sprintf(source, "0x%x", interface.transfer_buffer); /* block offset */ - temp = ptn->start / MMC_BLOCK_SIZE; - sprintf(dest, "0x%x", temp); + sprintf(dest, "0x%x", ptn->start); /* block count */ temp = (download_bytes + - MMC_BLOCK_SIZE - 1) / - MMC_BLOCK_SIZE; + MMC_SATA_BLOCK_SIZE - 1) / + MMC_SATA_BLOCK_SIZE; sprintf(length, "0x%x", temp); printf("Initializing '%s'\n", ptn->name); |