From 3717d5efb02b96104c0533df463d148faeb7afa1 Mon Sep 17 00:00:00 2001 From: Vince Hsu Date: Wed, 16 Jul 2014 10:37:15 +0800 Subject: Rename last_bl_blk to last_blk Also update the next_bct_blk. Then we have the correct pointer to the next block for the next image write. Signed-off-by: Vince Hsu Acked-by: Allen Martin --- src/cbootimage.h | 2 +- src/data_layout.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cbootimage.h b/src/cbootimage.h index 6def766..baade00 100644 --- a/src/cbootimage.h +++ b/src/cbootimage.h @@ -95,7 +95,7 @@ typedef struct build_image_context_rec u_int8_t *bct; char *bct_filename; - u_int32_t last_bl_blk; + u_int32_t last_blk; u_int32_t bct_size; /* The BCT file size */ u_int32_t boot_data_version; /* The boot data version of BCT */ u_int8_t bct_init; /* The flag for the memory allocation of bct */ diff --git a/src/data_layout.c b/src/data_layout.c index c848a61..73663be 100644 --- a/src/data_layout.c +++ b/src/data_layout.c @@ -552,8 +552,9 @@ write_bootloaders(build_image_context *context) current_blk++; virtual_blk++; } - context->last_bl_blk = current_blk; + context->last_blk = current_blk; } + context->next_bct_blk = context->last_blk + 1; free(buffer); } -- cgit v1.2.1