diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-31 18:32:53 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-31 18:32:53 +0200 |
| commit | d87080b721e4f8dca977af7571c5338ae7bb8db7 (patch) | |
| tree | 514fc21eec39a2dd57f7aea516844a4400f8f140 /lib_i386 | |
| parent | f6dbbe986481cff01334c64cacb971a5f237a9a9 (diff) | |
| download | talos-obmc-uboot-d87080b721e4f8dca977af7571c5338ae7bb8db7.tar.gz talos-obmc-uboot-d87080b721e4f8dca977af7571c5338ae7bb8db7.zip | |
GCC-4.x fixes: clean up global data pointer initialization for all boards.
Diffstat (limited to 'lib_i386')
| -rw-r--r-- | lib_i386/bios_setup.c | 3 | ||||
| -rw-r--r-- | lib_i386/board.c | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lib_i386/bios_setup.c b/lib_i386/bios_setup.c index bc9781550d..75f04a01fe 100644 --- a/lib_i386/bios_setup.c +++ b/lib_i386/bios_setup.c @@ -36,6 +36,8 @@ #include <asm/realmode.h> #include <asm/io.h> +DECLARE_GLOBAL_DATA_PTR; + #define NUMVECTS 256 #define BIOS_DATA ((char*)0x400) @@ -136,7 +138,6 @@ static void setvector(int vector, u16 segment, void *handler) int bios_setup(void) { - DECLARE_GLOBAL_DATA_PTR; static int done=0; int vector; struct pci_controller *pri_hose; diff --git a/lib_i386/board.c b/lib_i386/board.c index e90eb6e569..4175fdb1c4 100644 --- a/lib_i386/board.c +++ b/lib_i386/board.c @@ -38,6 +38,8 @@ #include <ide.h> #include <asm/u-boot-i386.h> +DECLARE_GLOBAL_DATA_PTR; + extern long _i386boot_start; extern long _i386boot_end; extern long _i386boot_romdata_start; @@ -80,8 +82,6 @@ static ulong mem_malloc_brk = 0; static int mem_malloc_init(void) { - DECLARE_GLOBAL_DATA_PTR; - /* start malloc area right after the stack */ mem_malloc_start = i386boot_bss_start + i386boot_bss_size + CFG_STACK_SIZE; @@ -130,8 +130,6 @@ char *strmhz (char *buf, long hz) */ static int init_baudrate (void) { - DECLARE_GLOBAL_DATA_PTR; - char tmp[64]; /* long enough for environment variables */ int i = getenv_r("baudrate", tmp, 64); @@ -167,7 +165,6 @@ static int display_banner (void) */ static int display_dram_config (void) { - DECLARE_GLOBAL_DATA_PTR; int i; puts ("DRAM Configuration:\n"); @@ -233,7 +230,6 @@ gd_t *global_data; void start_i386boot (void) { - DECLARE_GLOBAL_DATA_PTR; char *s; int i; ulong size; |
