Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b9e7d90 authored by Brian Swetland's avatar Brian Swetland Committed by Android Git Automerger
Browse files

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

Merge commit '8417d698' into gingerbread-plus-aosp

* commit '8417d698':
  handle 4096 byte pages if requested via --pagesize
parents 3c659a8d 8417d698

mkbootimg/mkbootimg.c

+7 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ int usage(void) 






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 @@ int main(int argc, char **argv) 
            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();

        }