[PATCH] powerpc: fix mktree build error on Mac OS X host

Josh Boyer jwboyer at linux.vnet.ibm.com
Fri May 1 22:47:40 EST 2009


On Thu, Apr 30, 2009 at 11:16:44PM -0500, Timur Tabi wrote:
>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 at freescale.com>

I believe this is only used by the 4xx boards anyway.

Acked-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>

>---
> arch/powerpc/boot/mktree.c |   10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/arch/powerpc/boot/mktree.c b/arch/powerpc/boot/mktree.c
>index 45d06a8..c2baae0 100644
>--- a/arch/powerpc/boot/mktree.c
>+++ b/arch/powerpc/boot/mktree.c
>@@ -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");
>-- 
>1.6.2.4
>
>_______________________________________________
>Linuxppc-dev mailing list
>Linuxppc-dev at ozlabs.org
>https://ozlabs.org/mailman/listinfo/linuxppc-dev



More information about the Linuxppc-dev mailing list