Merge branch 'next' of ../next

[platform/kernel/u-boot.git] / lib_i386 / bios_setup.c

diff --git a/lib_i386/bios_setup.c b/lib_i386/bios_setup.c
index 33c842c..6491e52 100644 (file)
--- a/lib_i386/bios_setup.c
+++ b/lib_i386/bios_setup.c
@@ -45,6 +45,9 @@ DECLARE_GLOBAL_DATA_PTR;
 #define BIOS_BASE        ((char*)0xf0000)
 #define BIOS_CS          0xf000
 
+extern ulong _i386boot_bios;
+extern ulong _i386boot_bios_size;
+
 /* these are defined in a 16bit segment and needs
  * to be accessed with the RELOC_16_xxxx() macros below
  */
@@ -138,6 +141,9 @@ static void setvector(int vector, u16 segment, void *handler)
 
 int bios_setup(void)
 {
+       ulong i386boot_bios      = (ulong)&_i386boot_bios;
+       ulong i386boot_bios_size = (ulong)&_i386boot_bios_size;
+
        static int done=0;
        int vector;
 #ifdef CONFIG_PCI