x86: Code cleanup

[oweals/u-boot.git] / arch / i386 / lib / bios_setup.c

diff --git a/arch/i386/lib/bios_setup.c b/arch/i386/lib/bios_setup.c
index a92b77ea237e912e2b692df99bca616b3d6f971d..6949b35069b9c8b2b5677903bff1d83473ede4e7 100644 (file)
--- a/arch/i386/lib/bios_setup.c
+++ b/arch/i386/lib/bios_setup.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Daniel Engström, Omicron Ceti AB, daniel@omicron.se
+ * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se>
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -21,7 +21,6 @@
  * MA 02111-1307 USA
  */
 
-
 /*
  * Partly based on msbios.c from rolo 1.6:
  *----------------------------------------------------------------------
@@ -45,8 +44,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #define BIOS_BASE        ((char*)0xf0000)
 #define BIOS_CS          0xf000
 
-extern ulong _i386boot_bios;
-extern ulong _i386boot_bios_size;
+extern ulong __bios_start;
+extern ulong __bios_size;
 
 /* these are defined in a 16bit segment and needs
  * to be accessed with the RELOC_16_xxxx() macros below
@@ -141,8 +140,8 @@ static void setvector(int vector, u16 segment, void *handler)
 
 int bios_setup(void)
 {
-       ulong i386boot_bios      = (ulong)&_i386boot_bios + gd->reloc_off;
-       ulong i386boot_bios_size = (ulong)&_i386boot_bios_size;
+       ulong bios_start = (ulong)&__bios_start + gd->reloc_off;
+       ulong bios_size = (ulong)&__bios_size;
 
        static int done=0;
        int vector;
@@ -154,13 +153,13 @@ int bios_setup(void)
        }
        done = 1;
 
-       if (i386boot_bios_size > 65536) {
+       if (bios_size > 65536) {
                printf("BIOS too large (%ld bytes, max is 65536)\n",
-                      i386boot_bios_size);
+                      bios_size);
                return -1;
        }
 
-       memcpy(BIOS_BASE, (void*)i386boot_bios, i386boot_bios_size);
+       memcpy(BIOS_BASE, (void*)bios_start, bios_size);
 
        /* clear bda */
        memset(BIOS_DATA, 0, BIOS_DATA_SIZE);