Merge branch 'master' of git://git.denx.de/u-boot-x86

[u-boot] / arch / x86 / lib / bios_setup.c

diff --git a/arch/x86/lib/bios_setup.c b/arch/x86/lib/bios_setup.c
index 053280b955b8fbdbeb3c878f3708e7ee949197dc..265f7d671ee3dce8efb8f09004b25466dfca0c7d 100644 (file)
--- a/arch/x86/lib/bios_setup.c
+++ b/arch/x86/lib/bios_setup.c
@@ -78,7 +78,8 @@ static void setvector(int vector, u16 segment, void *handler)
 
 int bios_setup(void)
 {
-       ulong bios_start = (ulong)&__bios_start + gd->reloc_off;
+       /* The BIOS section is not relocated and still in the ROM. */
+       ulong bios_start = (ulong)&__bios_start;
        ulong bios_size = (ulong)&__bios_size;
 
        static int done;