summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVince Hsu <vinceh@nvidia.com>2014-07-16 10:37:15 +0800
committerAllen Martin <amartin@nvidia.com>2014-07-15 21:13:07 -0700
commit3717d5efb02b96104c0533df463d148faeb7afa1 (patch)
tree47e0fd770c6dfe52dd4827429de47dce04df3914
parent502b18022673329ae98223555466158fee88eb53 (diff)
downloadnvidia-cbootimage-3717d5efb02b96104c0533df463d148faeb7afa1.tar.gz
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 <vinceh@nvidia.com> Acked-by: Allen Martin <amartin@nvidia.com>
-rw-r--r--src/cbootimage.h2
-rw-r--r--src/data_layout.c3
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);
}