commit e6950362ac8b82770a4ca8e974b560803ae62057
author Colin Cross <ccross@android.com> Sat May 03 18:41:19 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat May 03 18:41:19 2014 +0000
tree bef72ffa2d58f33bc1384e2c2294da0992c18157
parent a7bf5bd104276f9c593a7e97116f08044ad176a8
parent 8ec42bb203d48e917d8da4d925378b448416d09e

am 8ec42bb2: Merge "mkbootimg: fix padding calculation for 2ndstage loader"

* commit '8ec42bb203d48e917d8da4d925378b448416d09e':
  mkbootimg: fix padding calculation for 2ndstage loader

mkbootimg/mkbootimg.c

diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c
index d598f03..a7daccc 100644
--- a/mkbootimg/mkbootimg.c
+++ b/mkbootimg/mkbootimg.c
@@ -263,7 +263,7 @@
 
     if(second_data) {
         if(write(fd, second_data, hdr.second_size) != hdr.second_size) goto fail;
-        if(write_padding(fd, pagesize, hdr.ramdisk_size)) goto fail;
+        if(write_padding(fd, pagesize, hdr.second_size)) goto fail;
     }
 
     return 0;