diff options
Diffstat (limited to 'mkbootimg/mkbootimg.c')
| -rw-r--r-- | mkbootimg/mkbootimg.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c index e7c29181b..06fc95be8 100644 --- a/mkbootimg/mkbootimg.c +++ b/mkbootimg/mkbootimg.c @@ -66,6 +66,7 @@ int usage(void) " [ --base <address> ]\n" " [ --pagesize <pagesize> ]\n" " [ --ramdisk_offset <address> ]\n" + " [ --dt <filename> ]\n" " -o|--output <filename>\n" ); return 1; @@ -106,6 +107,8 @@ int main(int argc, char **argv) char *cmdline = ""; char *bootimg = 0; char *board = ""; + char *dt_fn = 0; + void *dt_data = 0; unsigned pagesize = 2048; int fd; SHA_CTX ctx; @@ -157,6 +160,8 @@ int main(int argc, char **argv) fprintf(stderr,"error: unsupported page size %d\n", pagesize); return -1; } + } else if(!strcmp(arg, "--dt")) { + dt_fn = val; } else { return usage(); } @@ -223,6 +228,14 @@ int main(int argc, char **argv) } } + if(dt_fn) { + dt_data = load_file(dt_fn, &hdr.dt_size); + if (dt_data == 0) { + fprintf(stderr,"error: could not load device tree image '%s'\n", dt_fn); + return 1; + } + } + /* put a hash of the contents in the header so boot images can be * differentiated based on their first 2k. */ @@ -233,6 +246,10 @@ int main(int argc, char **argv) SHA_update(&ctx, &hdr.ramdisk_size, sizeof(hdr.ramdisk_size)); SHA_update(&ctx, second_data, hdr.second_size); SHA_update(&ctx, &hdr.second_size, sizeof(hdr.second_size)); + if(dt_data) { + SHA_update(&ctx, dt_data, hdr.dt_size); + SHA_update(&ctx, &hdr.dt_size, sizeof(hdr.dt_size)); + } sha = SHA_final(&ctx); memcpy(hdr.id, sha, SHA_DIGEST_SIZE > sizeof(hdr.id) ? sizeof(hdr.id) : SHA_DIGEST_SIZE); @@ -257,6 +274,10 @@ int main(int argc, char **argv) if(write_padding(fd, pagesize, hdr.ramdisk_size)) goto fail; } + if(dt_data) { + if(write(fd, dt_data, hdr.dt_size) != hdr.dt_size) goto fail; + if(write_padding(fd, pagesize, hdr.dt_size)) goto fail; + } return 0; fail: |