fastboot, mkbootimg: support alternate base addresses
Add the --base flag to mkbootimg and -b flag to fastboot, to allow
the default kernel base address (0x10000000) to be changed.
Signed-off-by: Brian Swetland <swetland@google.com>
diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c
index d803cf6..3642647 100644
--- a/mkbootimg/mkbootimg.c
+++ b/mkbootimg/mkbootimg.c
@@ -63,6 +63,7 @@
" [ --second <2ndbootloader-filename> ]\n"
" [ --cmdline <kernel-commandline> ]\n"
" [ --board <boardname> ]\n"
+ " [ --base <address> ]\n"
" -o|--output <filename>\n"
);
return 1;
@@ -104,7 +105,6 @@
char *bootimg = 0;
char *board = "";
unsigned pagesize = 2048;
- unsigned saddr = 0;
int fd;
SHA_CTX ctx;
uint8_t* sha;
@@ -114,6 +114,14 @@
memset(&hdr, 0, sizeof(hdr));
+ /* default load addresses */
+ hdr.kernel_addr = 0x10008000;
+ hdr.ramdisk_addr = 0x11000000;
+ hdr.second_addr = 0x10F00000;
+ hdr.tags_addr = 0x10000100;
+
+ hdr.page_size = pagesize;
+
while(argc > 0){
char *arg = argv[0];
char *val = argv[1];
@@ -132,8 +140,12 @@
second_fn = val;
} else if(!strcmp(arg, "--cmdline")) {
cmdline = val;
- } else if(!strcmp(arg, "--saddr")) {
- saddr = strtoul(val, 0, 16);
+ } else if(!strcmp(arg, "--base")) {
+ unsigned base = strtoul(val, 0, 16);
+ hdr.kernel_addr = base + 0x00008000;
+ hdr.ramdisk_addr = base + 0x01000000;
+ hdr.second_addr = base + 0x00F00000;
+ hdr.tags_addr = base + 0x00000100;
} else if(!strcmp(arg, "--board")) {
board = val;
} else {
@@ -163,16 +175,6 @@
strcpy(hdr.name, board);
- hdr.kernel_addr = 0x10008000;
- hdr.ramdisk_addr = 0x11000000;
- if(saddr) {
- hdr.second_addr = 0x00300000;
- } else {
- hdr.second_addr = 0x10F00000;
- }
- hdr.tags_addr = 0x10000100;
- hdr.page_size = pagesize;
-
memcpy(hdr.magic, BOOT_MAGIC, BOOT_MAGIC_SIZE);
if(strlen(cmdline) > (BOOT_ARGS_SIZE - 1)) {