[MTD] Fix build warnings in RedBoot MTD partition parser.

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Tue May 16 12:59:02 EDT 2006


Commit:     b020bb7d3b3a8e3568a16eaf98c033bb9ee474eb
Parent:     155285c4775b7027b01a5b744c721ae43cced798
Author:     Ben Dooks <ben-linux at fluff.org>
AuthorDate: Tue May 16 17:31:15 2006 +0100
Commit:     David Woodhouse <dwmw2 at infradead.org>
CommitDate: Tue May 16 17:31:15 2006 +0100

    [MTD] Fix build warnings in RedBoot MTD partition parser.
    
    Fix build warnings from drivers/mtd/redboot.c due to
    use of `unsigned long` in `struct fis_image_desc` for
    fields being passed to swab32s() which expects __u32 *
    
    Change the entries to uint32_t to make them compatible
    with the swab32s() function
    
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>

 drivers/mtd/redboot.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c
index c077d2e..5b58523 100644
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -1,5 +1,5 @@
 /*
- * $Id: redboot.c,v 1.19 2005/12/01 10:03:51 dwmw2 Exp $
+ * $Id: redboot.c,v 1.21 2006/03/30 18:34:37 bjd Exp $
  *
  * Parse RedBoot-style Flash Image System (FIS) tables and
  * produce a Linux partition array to match.
@@ -15,14 +15,14 @@ #include <linux/mtd/partitions.h>
 
 struct fis_image_desc {
     unsigned char name[16];      // Null terminated name
-    unsigned long flash_base;    // Address within FLASH of image
-    unsigned long mem_base;      // Address in memory where it executes
-    unsigned long size;          // Length of image
-    unsigned long entry_point;   // Execution entry point
-    unsigned long data_length;   // Length of actual data
-    unsigned char _pad[256-(16+7*sizeof(unsigned long))];
-    unsigned long desc_cksum;    // Checksum over image descriptor
-    unsigned long file_cksum;    // Checksum over image data
+    uint32_t	  flash_base;    // Address within FLASH of image
+    uint32_t	  mem_base;      // Address in memory where it executes
+    uint32_t	  size;          // Length of image
+    uint32_t	  entry_point;   // Execution entry point
+    uint32_t	  data_length;   // Length of actual data
+    unsigned char _pad[256-(16+7*sizeof(uint32_t))];
+    uint32_t	  desc_cksum;    // Checksum over image descriptor
+    uint32_t	  file_cksum;    // Checksum over image data
 };
 
 struct fis_list {



More information about the linux-mtd-cvs mailing list