commit b17505bf46e168e369f591443685d9afbc23b1f1
author Brian Swetland <swetland@google.com> Wed Aug 11 17:06:34 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 11 17:06:34 2010 -0700
tree 652c8f7be5927af1140d2aa88cf9d0ccc4471200
parent d2278638d6b37717b51d622929eb4c8f6e16cb0c
parent 7b9e7d9006d52b78d189abe16c7c2bfe20fcb467

am 7b9e7d90: am 8417d698: handle 4096 byte pages if requested via --pagesize

Merge commit '7b9e7d9006d52b78d189abe16c7c2bfe20fcb467'

* commit '7b9e7d9006d52b78d189abe16c7c2bfe20fcb467':
  handle 4096 byte pages if requested via --pagesize

mkbootimg/mkbootimg.c

diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c
index 3642647..bdc572e 100644
--- a/mkbootimg/mkbootimg.c
+++ b/mkbootimg/mkbootimg.c
@@ -71,7 +71,7 @@
 
 
 
-static unsigned char padding[2048] = { 0, };
+static unsigned char padding[4096] = { 0, };
 
 int write_padding(int fd, unsigned pagesize, unsigned itemsize)
 {
@@ -148,6 +148,12 @@
             hdr.tags_addr =    base + 0x00000100;
         } else if(!strcmp(arg, "--board")) {
             board = val;
+        } else if(!strcmp(arg,"--pagesize")) {
+            pagesize = strtoul(val, 0, 10);
+            if ((pagesize != 2048) && (pagesize != 4096)) {
+                fprintf(stderr,"error: unsupported page size %d\n", pagesize);
+                return -1;
+            }
         } else {
             return usage();
         }