commit 2c72df998799738662a77cef3f522fdc6ae22fde
author Maarten Hooft <mthooft@google.com> Tue Aug 24 15:30:04 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 24 15:30:04 2010 -0700
tree 7a6a7b7c2e56e804f65868b61c88589bd906ae09
parent 0cd43305e9e12e0f2d622fe05286a2ed07fb2990
parent 65e461c478b000246ef81c3ca5fdd2dbb819d7ad

am 65e461c4: Fix the pagesize argument parsing

Merge commit '65e461c478b000246ef81c3ca5fdd2dbb819d7ad' into gingerbread-plus-aosp

* commit '65e461c478b000246ef81c3ca5fdd2dbb819d7ad':
  Fix the pagesize argument parsing

mkbootimg/mkbootimg.c

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 @@
     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 @@
             return usage();
         }
     }
+    hdr.page_size = pagesize;
+
 
     if(bootimg == 0) {
         fprintf(stderr,"error: no output filename specified\n");