summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-07-28 10:12:45 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-07-28 10:12:45 +0200
commit740f41d3cbefe2068247852220226c2c3b287249 (patch)
treea8afb3f0e3f0b7d4574cbbfd2e8d780db6b4ae08 /tools
parentf2c8d7f591e28d3437155c7a6eae8c8d9e3fe552 (diff)
parent7c48b015100eeff0e1bbb766394f7beca23afb48 (diff)
downloadu-boot-imx-740f41d3cbefe2068247852220226c2c3b287249.zip
u-boot-imx-740f41d3cbefe2068247852220226c2c3b287249.tar.gz
u-boot-imx-740f41d3cbefe2068247852220226c2c3b287249.tar.bz2
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
Diffstat (limited to 'tools')
-rw-r--r--tools/mksunxiboot.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/mksunxiboot.c b/tools/mksunxiboot.c
index da7c9f0..1f0fbae 100644
--- a/tools/mksunxiboot.c
+++ b/tools/mksunxiboot.c
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
{
int fd_in, fd_out;
struct boot_img img;
- unsigned file_size, load_size;
+ unsigned file_size;
int count;
if (argc < 2) {
@@ -101,8 +101,6 @@ int main(int argc, char *argv[])
if (file_size > SRAM_LOAD_MAX_SIZE) {
fprintf(stderr, "ERROR: File too large!\n");
return EXIT_FAILURE;
- } else {
- load_size = ALIGN(file_size, sizeof(int));
}
fd_out = open(argv[2], O_WRONLY | O_CREAT, 0666);
@@ -113,8 +111,8 @@ int main(int argc, char *argv[])
/* read file to buffer to calculate checksum */
lseek(fd_in, 0, SEEK_SET);
- count = read(fd_in, img.code, load_size);
- if (count != load_size) {
+ count = read(fd_in, img.code, file_size);
+ if (count != file_size) {
perror("Reading input image");
return EXIT_FAILURE;
}
@@ -126,7 +124,7 @@ int main(int argc, char *argv[])
& 0x00FFFFFF);
memcpy(img.header.magic, BOOT0_MAGIC, 8); /* no '0' termination */
img.header.length =
- ALIGN(load_size + sizeof(struct boot_file_head), BLOCK_SIZE);
+ ALIGN(file_size + sizeof(struct boot_file_head), BLOCK_SIZE);
gen_check_sum(&img.header);
count = write(fd_out, &img, img.header.length);