[PATCH] ppc32: fix mktree utility in 64-bit cross-compile environment

[PATCH] ppc32: fix mktree utility in 64-bit cross-compile environment

[Zink, Dan]

The mktree utility is using "unsigned long" in the definition of a boot
block structure.  This is bad when cross compiling from a 64-bit
architecture...

Thanks,
Dan


--- arch/ppc/boot/utils/mktree.c.old	2004-08-03 16:31:09.568992888
-0500
+++ arch/ppc/boot/utils/mktree.c	2004-08-03 16:32:26.773256056
-0500
@@ -15,19 +15,20 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <netinet/in.h>
+#include <asm/types.h>
 
 /* This gets tacked on the front of the image.  There are also a few
  * bytes allocated after the _start label used by the boot rom (see
  * head.S for details).
  */
 typedef struct boot_block {
-	unsigned long bb_magic;		/* 0x0052504F */
-	unsigned long bb_dest;		/* Target address of the image
*/
-	unsigned long bb_num_512blocks;	/* Size, rounded-up, in 512 byte
blks */
-	unsigned long bb_debug_flag;	/* Run debugger or image after
load */
-	unsigned long bb_entry_point;	/* The image address to start */
-	unsigned long bb_checksum;	/* 32 bit checksum including
header */
-	unsigned long reserved[2];
+	__u32 bb_magic;		/* 0x0052504F */
+	__u32 bb_dest;		/* Target address of the image */
+	__u32 bb_num_512blocks;	/* Size, rounded-up, in 512 byte blks */
+	__u32 bb_debug_flag;	/* Run debugger or image after load */
+	__u32 bb_entry_point;	/* The image address to start */
+	__u32 bb_checksum;	/* 32 bit checksum including header */
+	__u32 reserved[2];
 } boot_block_t;
 
 #define IMGBLK	512

Re: [PATCH] ppc32: fix mktree utility in 64-bit cross-compile environment

[Hollis Blanchard]

On Tue, 2004-08-03 at 17:01, Zink, Dan wrote:
> --- arch/ppc/boot/utils/mktree.c.old	2004-08-03 16:31:09.568992888
> -0500
> +++ arch/ppc/boot/utils/mktree.c	2004-08-03 16:32:26.773256056
> -0500
> @@ -15,19 +15,20 @@
>  #include <sys/stat.h>
>  #include <unistd.h>
>  #include <netinet/in.h>
> +#include <asm/types.h>

You'll notice we don't include any other <asm/*> headers; this tool can
be built standalone.

Is there a reason not to use <stdint.h> and uint32_t?

-- 
Hollis Blanchard
IBM Linux Technology Center

Re: [PATCH] ppc32: fix mktree utility in 64-bit cross-compile environment

[Tom Rini]

On Tue, Aug 03, 2004 at 05:01:05PM -0500, Zink, Dan wrote:

> The mktree utility is using "unsigned long" in the definition of a boot
> block structure.  This is bad when cross compiling from a 64-bit
> architecture...

<asm/types.h> isn't portable.  This program needs to still compile &
work on Cygwin & Solaris.

-- 
Tom Rini
http://gate.crashing.org/~trini/

RE: [PATCH] ppc32: fix mktree utility in 64-bit cross-compile environment

[Zink, Dan]

[-- Attachment #1: Type: text/plain, Size: 1819 bytes --]

Resending as an attachment because of unwanted line wrapping by my
mailer.

Dan

-----Original Message-----
From: Zink, Dan 
Sent: Tuesday, August 03, 2004 5:01 PM
To: 'akpm@osdl.org'; 'linuxppc-dev@lists.linuxppc.org'
Cc: 'linux-kernel@vger.kernel.org'
Subject: [PATCH] ppc32: fix mktree utility in 64-bit cross-compile
environment

The mktree utility is using "unsigned long" in the definition of a boot
block structure.  This is bad when cross compiling from a 64-bit
architecture...

Thanks,
Dan


--- arch/ppc/boot/utils/mktree.c.old	2004-08-03 16:31:09.568992888
-0500
+++ arch/ppc/boot/utils/mktree.c	2004-08-03 16:32:26.773256056
-0500
@@ -15,19 +15,20 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <netinet/in.h>
+#include <asm/types.h>
 
 /* This gets tacked on the front of the image.  There are also a few
  * bytes allocated after the _start label used by the boot rom (see
  * head.S for details).
  */
 typedef struct boot_block {
-	unsigned long bb_magic;		/* 0x0052504F */
-	unsigned long bb_dest;		/* Target address of the image
*/
-	unsigned long bb_num_512blocks;	/* Size, rounded-up, in 512 byte
blks */
-	unsigned long bb_debug_flag;	/* Run debugger or image after
load */
-	unsigned long bb_entry_point;	/* The image address to start */
-	unsigned long bb_checksum;	/* 32 bit checksum including
header */
-	unsigned long reserved[2];
+	__u32 bb_magic;		/* 0x0052504F */
+	__u32 bb_dest;		/* Target address of the image */
+	__u32 bb_num_512blocks;	/* Size, rounded-up, in 512 byte blks */
+	__u32 bb_debug_flag;	/* Run debugger or image after load */
+	__u32 bb_entry_point;	/* The image address to start */
+	__u32 bb_checksum;	/* 32 bit checksum including header */
+	__u32 reserved[2];
 } boot_block_t;
 
 #define IMGBLK	512

[-- Attachment #2: ppcfix.patch --]
[-- Type: application/octet-stream, Size: 1260 bytes --]

--- arch/ppc/boot/utils/mktree.c.old	2004-08-03 16:31:09.568992888 -0500
+++ arch/ppc/boot/utils/mktree.c	2004-08-03 16:32:26.773256056 -0500
@@ -15,19 +15,20 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <netinet/in.h>
+#include <asm/types.h>
 
 /* This gets tacked on the front of the image.  There are also a few
  * bytes allocated after the _start label used by the boot rom (see
  * head.S for details).
  */
 typedef struct boot_block {
-	unsigned long bb_magic;		/* 0x0052504F */
-	unsigned long bb_dest;		/* Target address of the image */
-	unsigned long bb_num_512blocks;	/* Size, rounded-up, in 512 byte blks */
-	unsigned long bb_debug_flag;	/* Run debugger or image after load */
-	unsigned long bb_entry_point;	/* The image address to start */
-	unsigned long bb_checksum;	/* 32 bit checksum including header */
-	unsigned long reserved[2];
+	__u32 bb_magic;		/* 0x0052504F */
+	__u32 bb_dest;		/* Target address of the image */
+	__u32 bb_num_512blocks;	/* Size, rounded-up, in 512 byte blks */
+	__u32 bb_debug_flag;	/* Run debugger or image after load */
+	__u32 bb_entry_point;	/* The image address to start */
+	__u32 bb_checksum;	/* 32 bit checksum including header */
+	__u32 reserved[2];
 } boot_block_t;
 
 #define IMGBLK	512