[LinuxBIOS] r2402 - in trunk/LinuxBIOSv2: src/mainboard/emulation/qemu-i386 targets/emulation/qemu-i386

Author: rminnich
Date: 2006-09-13 03:10:08 +0200 (Wed, 13 Sep 2006)
New Revision: 2402

Modified:
   trunk/LinuxBIOSv2/src/mainboard/emulation/qemu-i386/Config.lb
   trunk/LinuxBIOSv2/targets/emulation/qemu-i386/Config.lb
Log:
mods for qemu, these build
signed-off-by: ronald g. minnich

Modified: trunk/LinuxBIOSv2/src/mainboard/emulation/qemu-i386/Config.lb
===================================================================
--- trunk/LinuxBIOSv2/src/mainboard/emulation/qemu-i386/Config.lb	2006-09-08 17:44:42 UTC (rev 2401)
+++ trunk/LinuxBIOSv2/src/mainboard/emulation/qemu-i386/Config.lb	2006-09-13 01:10:08 UTC (rev 2402)
@@ -3,16 +3,9 @@
 ## (linuxBIOS plus bootloader) will live in the boot rom chip.
 ##
 default ROM_SIZE = 256 * 1024 
-default FALLBACK_SIZE = 128*1024
+default ROM_SECTION_SIZE   = ROM_SIZE
+default ROM_SECTION_OFFSET = 0

-if USE_FALLBACK_IMAGE
-	default ROM_SECTION_SIZE   = 128 * 1024 # FALLBACK_SIZE
-	default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
-else
-	default ROM_SECTION_SIZE   = ( ROM_SIZE - FALLBACK_SIZE )
-	default ROM_SECTION_OFFSET = 0
-end
-
 ##
 ## Compute the start location and size size of
 ## The linuxBIOS bootloader.
@@ -82,13 +75,8 @@
 ##
 ## Build our reset vector (This is where linuxBIOS is entered)
 ##
-if USE_FALLBACK_IMAGE 
-	mainboardinit cpu/x86/16bit/reset16.inc 
-	ldscript /cpu/x86/16bit/reset16.lds 
-else
-	mainboardinit cpu/x86/32bit/reset32.inc 
-	ldscript /cpu/x86/32bit/reset32.lds 
-end
+mainboardinit cpu/x86/16bit/reset16.inc 
+ldscript /cpu/x86/16bit/reset16.lds

### Should this be in the northbridge code?
 mainboardinit arch/i386/lib/cpu_reset.inc
@@ -100,16 +88,6 @@
 ldscript /arch/i386/lib/id.lds

###
-### This is the early phase of linuxBIOS startup 
-### Things are delicate and we test to see if we should
-### failover to another image.
-###
-if USE_FALLBACK_IMAGE
-	ldscript /arch/i386/lib/failover.lds 
-	mainboardinit ./failover.inc
-end
-
-###
 ### O.k. We aren't just an intermediary anymore!
 ###

Modified: trunk/LinuxBIOSv2/targets/emulation/qemu-i386/Config.lb
===================================================================
--- trunk/LinuxBIOSv2/targets/emulation/qemu-i386/Config.lb	2006-09-08 17:44:42 UTC (rev 2401)
+++ trunk/LinuxBIOSv2/targets/emulation/qemu-i386/Config.lb	2006-09-13 01:10:08 UTC (rev 2402)
@@ -8,7 +8,6 @@
 option CC="gcc -m32"

romimage "image" 
-	option USE_FALLBACK_IMAGE=1
    option ROM_IMAGE_SIZE=0x10000
    option LINUXBIOS_EXTRA_VERSION="-OpenBIOS"
    payload /home/stepan/openbios.elf