Skip to content

Commit

Permalink
powerpc: Fix mktree build error on Mac OS X host
Browse files Browse the repository at this point in the history
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 <timur@freescale.com>
Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Timur Tabi authored and Benjamin Herrenschmidt committed May 15, 2009
1 parent ba10eed commit 93f1cc6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/powerpc/boot/mktree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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.
Expand All @@ -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);
}
Expand All @@ -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");
Expand Down

0 comments on commit 93f1cc6

Please sign in to comment.