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

Commit 93f1cc60 authored by Timur Tabi's avatar Timur Tabi Committed by Benjamin Herrenschmidt
Browse files

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: default avatarTimur Tabi <timur@freescale.com>
Acked-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent ba10eedf

arch/powerpc/boot/mktree.c

+5 −5
Original line number Diff line number Diff line
@@ -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");