diff options
| author | Colin Cross <ccross@android.com> | 2013-03-12 16:53:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-12 16:53:24 -0700 |
| commit | d4b360a2e89d7d7f2dd7ff5f7dca6a2578c532cf (patch) | |
| tree | 870f2f928905c6a5f2e3071d60f2840cc23a510f | |
| parent | 451dd85fb204b5015c461eabc78722abd1c4252a (diff) | |
| parent | 1d77e6e4e3d304f86d0cfa2cfcf5266192420cae (diff) | |
| download | system_core-d4b360a2e89d7d7f2dd7ff5f7dca6a2578c532cf.zip system_core-d4b360a2e89d7d7f2dd7ff5f7dca6a2578c532cf.tar.gz system_core-d4b360a2e89d7d7f2dd7ff5f7dca6a2578c532cf.tar.bz2 | |
am 1d77e6e4: am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes"
* commit '1d77e6e4e3d304f86d0cfa2cfcf5266192420cae':
mkbootimg: support 8192/16384 pagesizes
| -rw-r--r-- | mkbootimg/mkbootimg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c index 2c32ce3..34a879b 100644 --- a/mkbootimg/mkbootimg.c +++ b/mkbootimg/mkbootimg.c @@ -72,7 +72,7 @@ int usage(void) -static unsigned char padding[4096] = { 0, }; +static unsigned char padding[16384] = { 0, }; int write_padding(int fd, unsigned pagesize, unsigned itemsize) { @@ -152,7 +152,8 @@ int main(int argc, char **argv) board = val; } else if(!strcmp(arg,"--pagesize")) { pagesize = strtoul(val, 0, 10); - if ((pagesize != 2048) && (pagesize != 4096)) { + if ((pagesize != 2048) && (pagesize != 4096) + && (pagesize != 8192) && (pagesize != 16384)) { fprintf(stderr,"error: unsupported page size %d\n", pagesize); return -1; } |