From 62231e0dd4feeed6ed20a146cb544f220d41eaff Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 5 Aug 2004 04:18:41 -0700 Subject: [PATCH] [PATCH] ppc32: Fix 'mktree' on 64bit hosts The following patch changes some 'unsigned long's into 'uint32_t's in mktree (a program that runs on the host to frob the kernel image for some firmwares). Without it, the program is not correct when run on/compiled on a 64bit host. Signed-off-by: Dan Zink Signed-off-by: Tom Rini Signed-off-by: Linus Torvalds --- arch/ppc/boot/utils/mktree.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/ppc/boot/utils/mktree.c b/arch/ppc/boot/utils/mktree.c index b5bf82b9ddf8b..7ef98c077aadb 100644 --- a/arch/ppc/boot/utils/mktree.c +++ b/arch/ppc/boot/utils/mktree.c @@ -15,19 +15,20 @@ #include #include #include +#include /* 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]; + uint32_t bb_magic; /* 0x0052504F */ + uint32_t bb_dest; /* Target address of the image */ + uint32_t bb_num_512blocks; /* Size, rounded-up, in 512 byte blks */ + uint32_t bb_debug_flag; /* Run debugger or image after load */ + uint32_t bb_entry_point; /* The image address to start */ + uint32_t bb_checksum; /* 32 bit checksum including header */ + uint32_t reserved[2]; } boot_block_t; #define IMGBLK 512 -- 2.53.0