| Message ID | 1455045551-12971-2-git-send-email-srae@broadcom.com |
|---|---|
| State | Accepted |
| Commit | e3793541b15d631476e91343a21c5b23b19c9da8 |
| Delegated to: | Tom Rini |
| Headers | show |
please, can this be accepted? On Tue, Feb 9, 2016 at 11:19 AM, Steve Rae <srae@broadcom.com> wrote: > remove logging of the 'skipped' blocks > > Signed-off-by: Steve Rae <srae@broadcom.com> > --- > > Changes in v2: None > > common/image-sparse.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/common/image-sparse.c b/common/image-sparse.c > index ef0d232..737e8ea 100644 > --- a/common/image-sparse.c > +++ b/common/image-sparse.c > @@ -275,7 +275,6 @@ int store_sparse_image(sparse_storage_t *storage, void > *storage_priv, > sparse_buffer_t *buffer; > uint32_t start; > uint32_t total_blocks = 0; > - uint32_t skipped = 0; > int i; > > debug("=== Storage ===\n"); > @@ -336,7 +335,6 @@ int store_sparse_image(sparse_storage_t *storage, void > *storage_priv, > #ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV > total_blocks += blkcnt; > #endif > - skipped += blkcnt; > continue; > } > > @@ -377,8 +375,8 @@ int store_sparse_image(sparse_storage_t *storage, void > *storage_priv, > sparse_put_data_buffer(buffer); > } > > - debug("Wrote %d blocks, skipped %d, expected to write %d blocks\n", > - total_blocks, skipped, > + debug("Wrote %d blocks, expected to write %d blocks\n", > + total_blocks, > sparse_block_size_to_storage(sparse_header->total_blks, > storage, sparse_header)); > printf("........ wrote %d blocks to '%s'\n", total_blocks, > -- > 1.8.5 > >
On Tue, Feb 09, 2016 at 11:19:11AM -0800, Steve Rae wrote: > remove logging of the 'skipped' blocks > > Signed-off-by: Steve Rae <srae@broadcom.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Thanks! Maxime
On Wed, Mar 9, 2016 at 12:47 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > On Tue, Feb 09, 2016 at 11:19:11AM -0800, Steve Rae wrote: >> remove logging of the 'skipped' blocks >> >> Signed-off-by: Steve Rae <srae@broadcom.com> > > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > Thanks! > Maxime > > -- > Maxime Ripard, Free Electrons > Embedded Linux, Kernel and Android engineering > http://free-electrons.com can this be applied? Thanks
On Tue, Feb 09, 2016 at 11:19:11AM -0800, Steve Rae wrote: > remove logging of the 'skipped' blocks > > Signed-off-by: Steve Rae <srae@broadcom.com> > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Applied to u-boot/master, thanks!
diff --git a/common/image-sparse.c b/common/image-sparse.c index ef0d232..737e8ea 100644 --- a/common/image-sparse.c +++ b/common/image-sparse.c @@ -275,7 +275,6 @@ int store_sparse_image(sparse_storage_t *storage, void *storage_priv, sparse_buffer_t *buffer; uint32_t start; uint32_t total_blocks = 0; - uint32_t skipped = 0; int i; debug("=== Storage ===\n"); @@ -336,7 +335,6 @@ int store_sparse_image(sparse_storage_t *storage, void *storage_priv, #ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV total_blocks += blkcnt; #endif - skipped += blkcnt; continue; } @@ -377,8 +375,8 @@ int store_sparse_image(sparse_storage_t *storage, void *storage_priv, sparse_put_data_buffer(buffer); } - debug("Wrote %d blocks, skipped %d, expected to write %d blocks\n", - total_blocks, skipped, + debug("Wrote %d blocks, expected to write %d blocks\n", + total_blocks, sparse_block_size_to_storage(sparse_header->total_blks, storage, sparse_header)); printf("........ wrote %d blocks to '%s'\n", total_blocks,
remove logging of the 'skipped' blocks Signed-off-by: Steve Rae <srae@broadcom.com> --- Changes in v2: None common/image-sparse.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)