Fix a warning type in lib_i386/board.c

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[EMAIL PROTECTED]>
---
 include/asm-i386/global_data.h |    4 +---
 lib_i386/board.c               |   11 +++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/include/asm-i386/global_data.h b/include/asm-i386/global_data.h
index 68a9ad6..9b3f7c1 100644
--- a/include/asm-i386/global_data.h
+++ b/include/asm-i386/global_data.h
@@ -56,8 +56,6 @@ typedef       struct {
 #define        GD_FLG_SILENT   0x00004         /* Silent mode                  
        */
 #define        GD_FLG_POSTFAIL 0x00008         /* Critical POST test failed    
        */
 
-extern gd_t *global_data;
-
-#define DECLARE_GLOBAL_DATA_PTR     gd_t *gd = global_data
+#define DECLARE_GLOBAL_DATA_PTR                extern gd_t *gd
 
 #endif /* __ASM_GBL_DATA_H */
diff --git a/lib_i386/board.c b/lib_i386/board.c
index 22191e6..e73f697 100644
--- a/lib_i386/board.c
+++ b/lib_i386/board.c
@@ -38,6 +38,9 @@
 #include <ide.h>
 #include <asm/u-boot-i386.h>
 
+gd_t gd_data;
+gd_t *gd;
+
 DECLARE_GLOBAL_DATA_PTR;
 
 extern long _i386boot_start;
@@ -68,7 +71,6 @@ ulong i386boot_realmode_size = 
(ulong)&_i386boot_realmode_size; /* size of realm
 ulong i386boot_bios          = (ulong)&_i386boot_bios;          /* start of 
BIOS emulation code */
 ulong i386boot_bios_size     = (ulong)&_i386boot_bios_size;     /* size of 
BIOS emulation code */
 
-
 const char version_string[] =
        U_BOOT_VERSION" (" __DATE__ " - " __TIME__ ")";
 
@@ -226,20 +228,17 @@ init_fnc_t *init_sequence[] = {
        NULL,
 };
 
-gd_t *global_data;
-
 void start_i386boot (void)
 {
        char *s;
        int i;
        ulong size;
-       static gd_t gd_data;
        static bd_t bd_data;
        init_fnc_t **init_fnc_ptr;
 
        show_boot_progress(0x21);
 
-       gd = global_data = &gd_data;
+       gd = &gd_data;
        /* compiler optimization barrier needed for GCC >= 3.4 */
        __asm__ __volatile__("": : :"memory");
 
@@ -279,7 +278,7 @@ void start_i386boot (void)
                int i;
                ulong reg;
                char *s, *e;
-               uchar tmp[64];
+               char tmp[64];
 
                i = getenv_r ("ethaddr", tmp, sizeof (tmp));
                s = (i > 0) ? tmp : NULL;
-- 
1.5.5.1


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft 
Defy all challenges. Microsoft(R) Visual Studio 2008. 
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users

Reply via email to