aboutsummaryrefslogtreecommitdiffstats
path: root/mkbootimg
diff options
context:
space:
mode:
authorEd Heyl <ed@google.com>2012-07-28 11:48:12 -0700
committerEd Heyl <ed@google.com>2012-07-28 11:48:12 -0700
commit3cac204d3537c6a356c922bffb07fcb97f5bb0c7 (patch)
tree710f7bb28670f8df39ab4529c52fce812b471129 /mkbootimg
parentce8ffda06397f4a3f8c75f8e2c41f8883625e4f3 (diff)
parentc2dcdc2024ac7487f9773b9b9a4d20bf78e5b7a1 (diff)
downloadsystem_core-3cac204d3537c6a356c922bffb07fcb97f5bb0c7.tar.gz
system_core-3cac204d3537c6a356c922bffb07fcb97f5bb0c7.tar.bz2
system_core-3cac204d3537c6a356c922bffb07fcb97f5bb0c7.zip
Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev
Diffstat (limited to 'mkbootimg')
-rw-r--r--mkbootimg/mkbootimg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c
index a94cb9c8..d72e3176 100644
--- a/mkbootimg/mkbootimg.c
+++ b/mkbootimg/mkbootimg.c
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
} else if(!strcmp(arg, "--base")) {
unsigned base = strtoul(val, 0, 16);
hdr.kernel_addr = base + 0x00008000;
- hdr.ramdisk_addr = base + 0x01000000;
+ hdr.ramdisk_addr = base + 0x01300000;
hdr.second_addr = base + 0x00F00000;
hdr.tags_addr = base + 0x00000100;
} else if(!strcmp(arg, "--board")) {