am 1d77e6e4: am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes"

* commit '1d77e6e4e3d304f86d0cfa2cfcf5266192420cae':
  mkbootimg: support 8192/16384 pagesizes
This commit is contained in:
Colin Cross 2013-03-12 16:53:24 -07:00 committed by Android Git Automerger
commit d4b360a2e8

View file

@ -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;
}