summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaarten Hooft <mthooft@google.com>2010-08-24 15:30:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-24 15:30:04 -0700
commit2c72df998799738662a77cef3f522fdc6ae22fde (patch)
tree7a6a7b7c2e56e804f65868b61c88589bd906ae09
parent0cd43305e9e12e0f2d622fe05286a2ed07fb2990 (diff)
parent65e461c478b000246ef81c3ca5fdd2dbb819d7ad (diff)
downloadsystem_core-2c72df998799738662a77cef3f522fdc6ae22fde.zip
system_core-2c72df998799738662a77cef3f522fdc6ae22fde.tar.gz
system_core-2c72df998799738662a77cef3f522fdc6ae22fde.tar.bz2
am 65e461c4: Fix the pagesize argument parsing
Merge commit '65e461c478b000246ef81c3ca5fdd2dbb819d7ad' into gingerbread-plus-aosp * commit '65e461c478b000246ef81c3ca5fdd2dbb819d7ad': Fix the pagesize argument parsing
-rw-r--r--mkbootimg/mkbootimg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c
index 47ab5f1..a94cb9c 100644
--- a/mkbootimg/mkbootimg.c
+++ b/mkbootimg/mkbootimg.c
@@ -121,8 +121,6 @@ int main(int argc, char **argv)
hdr.second_addr = 0x10F00000;
hdr.tags_addr = 0x10000100;
- hdr.page_size = pagesize;
-
while(argc > 0){
char *arg = argv[0];
char *val = argv[1];
@@ -159,6 +157,8 @@ int main(int argc, char **argv)
return usage();
}
}
+ hdr.page_size = pagesize;
+
if(bootimg == 0) {
fprintf(stderr,"error: no output filename specified\n");