diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-11 10:00:34 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-11 10:00:34 +0200 |
| commit | bfc7bea6adc46e1db2f5a5e3464d7652ed67c864 (patch) | |
| tree | 4399dca93e4c42a3f652dd5b0b6143ab4aef50f4 /arch/i386/lib/realmode.c | |
| parent | 29840de6b6d322e9cca3d22d254a1d066afbef02 (diff) | |
| parent | c868af3e57610b41c6ed4fd8d8744d8cc0a21b29 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/i386/lib/realmode.c')
| -rw-r--r-- | arch/i386/lib/realmode.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/i386/lib/realmode.c b/arch/i386/lib/realmode.c index b3f51230a5b..60fe1816a17 100644 --- a/arch/i386/lib/realmode.c +++ b/arch/i386/lib/realmode.c @@ -31,23 +31,23 @@ #define REALMODE_MAILBOX ((char*)0xe00) -extern ulong _i386boot_realmode; -extern ulong _i386boot_realmode_size; +extern ulong __realmode_start; +extern ulong __realmode_size; extern char realmode_enter; int realmode_setup(void) { - ulong i386boot_realmode = (ulong)&_i386boot_realmode + gd->reloc_off; - ulong i386boot_realmode_size = (ulong)&_i386boot_realmode_size; + ulong realmode_start = (ulong)&__realmode_start + gd->reloc_off; + ulong realmode_size = (ulong)&__realmode_size; /* copy the realmode switch code */ - if (i386boot_realmode_size > (REALMODE_MAILBOX-REALMODE_BASE)) { + if (realmode_size > (REALMODE_MAILBOX-REALMODE_BASE)) { printf("realmode switch too large (%ld bytes, max is %d)\n", - i386boot_realmode_size, (REALMODE_MAILBOX-REALMODE_BASE)); + realmode_size, (REALMODE_MAILBOX-REALMODE_BASE)); return -1; } - memcpy(REALMODE_BASE, (void*)i386boot_realmode, i386boot_realmode_size); + memcpy(REALMODE_BASE, (void*)realmode_start, realmode_size); asm("wbinvd\n"); return 0; |