* [U-Boot] [PATCH v2 2/2] fastboot: sparse: remove unnecessary logging
2016-02-09 19:19 [U-Boot] [PATCH v2 1/2] fastboot: sparse: fix block addressing for don't care chunk type Steve Rae
@ 2016-02-09 19:19 ` Steve Rae
2016-02-29 22:38 ` Steve Rae
` (2 more replies)
2016-02-29 22:37 ` [U-Boot] [PATCH v2 1/2] fastboot: sparse: fix block addressing for don't care chunk type Steve Rae
` (2 subsequent siblings)
3 siblings, 3 replies; 10+ messages in thread
From: Steve Rae @ 2016-02-09 19:19 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot] [PATCH v2 2/2] fastboot: sparse: remove unnecessary logging
2016-02-09 19:19 ` [U-Boot] [PATCH v2 2/2] fastboot: sparse: remove unnecessary logging Steve Rae
@ 2016-02-29 22:38 ` Steve Rae
2016-03-09 20:47 ` Maxime Ripard
2016-04-12 2:28 ` [U-Boot] [U-Boot, v2, " Tom Rini
2 siblings, 0 replies; 10+ messages in thread
From: Steve Rae @ 2016-02-29 22:38 UTC (permalink / raw)
To: u-boot
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
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread* [U-Boot] [PATCH v2 2/2] fastboot: sparse: remove unnecessary logging
2016-02-09 19:19 ` [U-Boot] [PATCH v2 2/2] fastboot: sparse: remove unnecessary logging Steve Rae
2016-02-29 22:38 ` Steve Rae
@ 2016-03-09 20:47 ` Maxime Ripard
2016-03-23 22:15 ` Steve Rae
2016-04-12 2:28 ` [U-Boot] [U-Boot, v2, " Tom Rini
2 siblings, 1 reply; 10+ messages in thread
From: Maxime Ripard @ 2016-03-09 20:47 UTC (permalink / raw)
To: u-boot
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160309/dba9603d/attachment.sig>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 2/2] fastboot: sparse: remove unnecessary logging
2016-03-09 20:47 ` Maxime Ripard
@ 2016-03-23 22:15 ` Steve Rae
0 siblings, 0 replies; 10+ messages in thread
From: Steve Rae @ 2016-03-23 22:15 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [U-Boot, v2, 2/2] fastboot: sparse: remove unnecessary logging
2016-02-09 19:19 ` [U-Boot] [PATCH v2 2/2] fastboot: sparse: remove unnecessary logging Steve Rae
2016-02-29 22:38 ` Steve Rae
2016-03-09 20:47 ` Maxime Ripard
@ 2016-04-12 2:28 ` Tom Rini
2 siblings, 0 replies; 10+ messages in thread
From: Tom Rini @ 2016-04-12 2:28 UTC (permalink / raw)
To: u-boot
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!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160411/60ed7743/attachment.sig>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 1/2] fastboot: sparse: fix block addressing for don't care chunk type
2016-02-09 19:19 [U-Boot] [PATCH v2 1/2] fastboot: sparse: fix block addressing for don't care chunk type Steve Rae
2016-02-09 19:19 ` [U-Boot] [PATCH v2 2/2] fastboot: sparse: remove unnecessary logging Steve Rae
@ 2016-02-29 22:37 ` Steve Rae
2016-03-09 20:46 ` Maxime Ripard
2016-04-12 2:28 ` [U-Boot] [U-Boot, v2, " Tom Rini
3 siblings, 0 replies; 10+ messages in thread
From: Steve Rae @ 2016-02-29 22:37 UTC (permalink / raw)
To: u-boot
please, can this be accepted?
On Tue, Feb 9, 2016 at 11:19 AM, Steve Rae <srae@broadcom.com> wrote:
> When 7bfc3b1 (sparse: Refactor chunk parsing function) was implemented,
> it dropped 9981945 (aboot: fix block addressing for don't care chunk type).
>
> This re-implements the required fix for the "don't care chunk type"...
>
> Signed-off-by: Steve Rae <srae@broadcom.com>
> ---
>
> Changes in v2:
> Handle MMC device differently than the NAND device.
>
> common/image-sparse.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/common/image-sparse.c b/common/image-sparse.c
> index dffe844..ef0d232 100644
> --- a/common/image-sparse.c
> +++ b/common/image-sparse.c
> @@ -330,9 +330,13 @@ int store_sparse_image(sparse_storage_t *storage,
> void *storage_priv,
> * and go on parsing the rest of the chunks
> */
> if (chunk_header->chunk_type == CHUNK_TYPE_DONT_CARE) {
> - skipped +=
> sparse_block_size_to_storage(chunk_header->chunk_sz,
> - storage,
> -
> sparse_header);
> + blkcnt =
> sparse_block_size_to_storage(chunk_header->chunk_sz,
> + storage,
> +
> sparse_header);
> +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV
> + total_blocks += blkcnt;
> +#endif
> + skipped += blkcnt;
> continue;
> }
>
> @@ -380,7 +384,7 @@ int store_sparse_image(sparse_storage_t *storage, void
> *storage_priv,
> printf("........ wrote %d blocks to '%s'\n", total_blocks,
> storage->name);
>
> - if ((total_blocks + skipped) !=
> + if (total_blocks !=
> sparse_block_size_to_storage(sparse_header->total_blks,
> storage, sparse_header)) {
> printf("sparse image write failure\n");
> --
> 1.8.5
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread* [U-Boot] [PATCH v2 1/2] fastboot: sparse: fix block addressing for don't care chunk type
2016-02-09 19:19 [U-Boot] [PATCH v2 1/2] fastboot: sparse: fix block addressing for don't care chunk type Steve Rae
2016-02-09 19:19 ` [U-Boot] [PATCH v2 2/2] fastboot: sparse: remove unnecessary logging Steve Rae
2016-02-29 22:37 ` [U-Boot] [PATCH v2 1/2] fastboot: sparse: fix block addressing for don't care chunk type Steve Rae
@ 2016-03-09 20:46 ` Maxime Ripard
2016-03-23 22:14 ` Steve Rae
2016-04-12 2:28 ` [U-Boot] [U-Boot, v2, " Tom Rini
3 siblings, 1 reply; 10+ messages in thread
From: Maxime Ripard @ 2016-03-09 20:46 UTC (permalink / raw)
To: u-boot
On Tue, Feb 09, 2016 at 11:19:10AM -0800, Steve Rae wrote:
> When 7bfc3b1 (sparse: Refactor chunk parsing function) was implemented,
> it dropped 9981945 (aboot: fix block addressing for don't care chunk type).
>
> This re-implements the required fix for the "don't care chunk type"...
>
> 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160309/7dc7e660/attachment.sig>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 1/2] fastboot: sparse: fix block addressing for don't care chunk type
2016-03-09 20:46 ` Maxime Ripard
@ 2016-03-23 22:14 ` Steve Rae
0 siblings, 0 replies; 10+ messages in thread
From: Steve Rae @ 2016-03-23 22:14 UTC (permalink / raw)
To: u-boot
On Wed, Mar 9, 2016 at 12:46 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> On Tue, Feb 09, 2016 at 11:19:10AM -0800, Steve Rae wrote:
>> When 7bfc3b1 (sparse: Refactor chunk parsing function) was implemented,
>> it dropped 9981945 (aboot: fix block addressing for don't care chunk type).
>>
>> This re-implements the required fix for the "don't care chunk type"...
>>
>> 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
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [U-Boot, v2, 1/2] fastboot: sparse: fix block addressing for don't care chunk type
2016-02-09 19:19 [U-Boot] [PATCH v2 1/2] fastboot: sparse: fix block addressing for don't care chunk type Steve Rae
` (2 preceding siblings ...)
2016-03-09 20:46 ` Maxime Ripard
@ 2016-04-12 2:28 ` Tom Rini
3 siblings, 0 replies; 10+ messages in thread
From: Tom Rini @ 2016-04-12 2:28 UTC (permalink / raw)
To: u-boot
On Tue, Feb 09, 2016 at 11:19:10AM -0800, Steve Rae wrote:
> When 7bfc3b1 (sparse: Refactor chunk parsing function) was implemented,
> it dropped 9981945 (aboot: fix block addressing for don't care chunk type).
>
> This re-implements the required fix for the "don't care chunk type"...
>
> Signed-off-by: Steve Rae <srae@broadcom.com>
> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160411/b64aa96b/attachment.sig>
^ permalink raw reply [flat|nested] 10+ messages in thread