diff options
| author | Tom Rini <trini@konsulko.com> | 2022-06-15 23:10:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-15 23:10:17 -0400 |
| commit | 488d30a1e9f937b6e2726791dceb865e9e10e118 (patch) | |
| tree | 539dceeba73019a41c8c59a304d1ae85e0aa443c /env/mmc.c | |
| parent | c18e5fb055ab789f58434e3cb432582adee0134c (diff) | |
| parent | 12a29d3b851029212ca3b3e0f233fc7b62aa0a39 (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-mmc
Diffstat (limited to 'env/mmc.c')
| -rw-r--r-- | env/mmc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/env/mmc.c b/env/mmc.c index 465b104559b..0c498d9a46b 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -257,12 +257,15 @@ static inline int erase_env(struct mmc *mmc, unsigned long size, { uint blk_start, blk_cnt, n; struct blk_desc *desc = mmc_get_blk_desc(mmc); + u32 erase_size; - blk_start = ALIGN(offset, mmc->write_bl_len) / mmc->write_bl_len; - blk_cnt = ALIGN(size, mmc->write_bl_len) / mmc->write_bl_len; + erase_size = mmc->erase_grp_size * desc->blksz; + blk_start = ALIGN_DOWN(offset, erase_size) / desc->blksz; + blk_cnt = ALIGN(size, erase_size) / desc->blksz; n = blk_derase(desc, blk_start, blk_cnt); - printf("%d blocks erased: %s\n", n, (n == blk_cnt) ? "OK" : "ERROR"); + printf("%d blocks erased at 0x%x: %s\n", n, blk_start, + (n == blk_cnt) ? "OK" : "ERROR"); return (n == blk_cnt) ? 0 : 1; } @@ -286,6 +289,7 @@ static int env_mmc_erase(void) goto fini; } + printf("\n"); ret = erase_env(mmc, CONFIG_ENV_SIZE, offset); #ifdef CONFIG_ENV_OFFSET_REDUND |