diff options
| author | Graeme Russ <graeme.russ@gmail.com> | 2008-09-07 07:08:42 +1000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-09 11:48:53 +0200 |
| commit | 3ef96ded38a8d33b58b9fab9cd879d51ddac4cbd (patch) | |
| tree | b40a0685df1836f251fab53f4a767bb7287e0d03 /lib_i386/board.c | |
| parent | 5608692104efa8d56df803dc79ea41ac3607eee5 (diff) | |
Update i386 code (sc520_cdp)
Attempt to bring i386 / sc520 inline with master
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Diffstat (limited to 'lib_i386/board.c')
| -rw-r--r-- | lib_i386/board.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib_i386/board.c b/lib_i386/board.c index 55fa42af4..f3da0a292 100644 --- a/lib_i386/board.c +++ b/lib_i386/board.c @@ -213,7 +213,7 @@ init_fnc_t *init_sequence[] = { NULL, }; -gd_t *global_data; +gd_t *gd; void start_i386boot (void) { @@ -226,7 +226,7 @@ void start_i386boot (void) show_boot_progress(0x21); - gd = global_data = &gd_data; + gd = &gd_data; /* compiler optimization barrier needed for GCC >= 3.4 */ __asm__ __volatile__("": : :"memory"); @@ -266,7 +266,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; @@ -412,7 +412,10 @@ void hang (void) unsigned long do_go_exec (ulong (*entry)(int, char *[]), int argc, char *argv[]) { /* - * Nios function pointers are address >> 1 + * TODO: Test this function - changed to fix compiler error. + * Original code was: + * return (entry >> 1) (argc, argv); + * with a comment about Nios function pointers are address >> 1 */ - return (entry >> 1) (argc, argv); + return (entry) (argc, argv); } |