powerpc: fix mktree build error on Mac OS X host
PATCH 1/1 powerpc: fix mktree build error on Mac OS X host
The mktree utility defines some variables as "uint", although this is not a standard C type, and so cross-compiling on Mac OS X fails. Change this to "unsigned int".
Signed-off-by Timur Tabi <[email protected]>
--- arch/powerpc/boot/mktree.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/boot/mktree.c +5 -5
@@ -42,7 +42,7 @@ int main(int argc, char *argv[]) {int in_fd, out_fd;int nblks, i; -uint cksum, *cp; +unsigned int cksum, *cp;struct stat st;boot_block_t bt;
@@ -90,7 +90,7 @@ int main(int argc, char *argv[]) cksum =0 ; cp = (void *)&bt; -for (i=0 ; i<sizeof (bt)/sizeof (uint); i++) +for (i =0 ; i <sizeof (bt) /sizeof (unsigned int ); i++) cksum += *cp++;/* Assume zImage is an ELF file, and skip the 64K header.
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])exit (4 ); } -if ((*(uint *)tmpbuf) !=htonl (0x7f454c46 )) { +if ((*(unsigned int *)tmpbuf) !=htonl (0x7f454c46 )) {fprintf (stderr,"%s is not an ELF image\n" , argv[1 ]);exit (4 ); }
@@ -125,8 +125,8 @@ int main(int argc, char *argv[])perror ("zImage read" );exit (5 ); } - cp = (uint *)tmpbuf; -for (i=0 ; i<sizeof (tmpbuf)/sizeof (uint); i++) + cp = (unsigned int *)tmpbuf; +for (i =0 ; i <sizeof (tmpbuf) /sizeof (unsigned int ); i++) cksum += *cp++;if (write (out_fd, tmpbuf,sizeof (tmpbuf)) !=sizeof (tmpbuf)) {perror ("boot-image write" );
Signature · 1 line
1.6.2.4
Quoted 5 lines · Timur Tabi
The mktree utility defines some variables as "uint", although this is not a standard C type, and so cross-compiling on Mac OS X fails. Change this to "unsigned int".
Signed-off-by Timur Tabi <[email protected]>
I believe this is only used by the 4xx boards anyway.
Acked-by Josh Boyer <[email protected]>
Quoted 53 lines
---
arch/powerpc/boot/mktree.c| 10 +++++-----1 files changed, 5 insertions(+), 5 deletions(-)arch/powerpc/boot/mktree.c +5
-5@@ -42,7 +42,7 @@ int main(int argc, char *argv[]) {int in_fd, out_fd;int nblks, i; -uint cksum, *cp; +unsigned int cksum, *cp;struct stat st;boot_block_t bt;@@ -90,7 +90,7 @@ int main(int argc, char *argv[]) cksum =0 ; cp = (void *)&bt; -for (i=0 ; i<sizeof (bt)/sizeof (uint); i++) +for (i =0 ; i <sizeof (bt) /sizeof (unsigned int ); i++) cksum += *cp++;/* Assume zImage is an ELF file, and skip the 64K header. @@ -101,7 +101,7 @@ int main(int argc, char *argv[])exit (4 ); } -if ((*(uint *)tmpbuf) !=htonl (0x7f454c46 )) { +if ((*(unsigned int *)tmpbuf) !=htonl (0x7f454c46 )) {fprintf (stderr,"%s is not an ELF image\n" , argv[1 ]);exit (4 ); }@@ -125,8 +125,8 @@ int main(int argc, char *argv[])perror ("zImage read" );exit (5 ); } - cp = (uint *)tmpbuf; -for (i=0 ; i<sizeof (tmpbuf)/sizeof (uint); i++) + cp = (unsigned int *)tmpbuf; +for (i =0 ; i <sizeof (tmpbuf) /sizeof (unsigned int ); i++) cksum += *cp++;if (write (out_fd, tmpbuf,sizeof (tmpbuf)) !=sizeof (tmpbuf)) {perror ("boot-image write" );Signature · 6 lines
1.6.2.4 _______________________________________________ Linuxppc-dev mailing list [email protected] https://ozlabs.org/mailman/listinfo/linuxppc-dev