Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-36

Creator:  Li-Ta Lo <ollie@lanl.gov>

emulator update

Correction to the reduce emulator from Paulo


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1952 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

3 files changed, 23 insertions, 90 deletions

diff --git a/targets/arima/hdama/Config.lb b/targets/arima/hdama/Config.lb
index 8e5a16c02e..1dce4fdc8b 100644
--- a/targets/arima/hdama/Config.lb
+++ b/targets/arima/hdama/Config.lb
@@ -6,20 +6,22 @@
 target hdama
 mainboard arima/hdama
 
+option ROM_SIZE=487424
+
 # Arima hdama
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x10400
+	option ROM_IMAGE_SIZE=0x16000
 	option LINUXBIOS_EXTRA_VERSION=".0Normal"
-	payload /usr/share/etherboot/5.2.1eb1-lnxi-lb/tg3--ide_disk.zelf
+	payload /home/ollie/work/filo-0.4.1/filo.elf
+#	payload /etc/hosts
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x10400
+	option ROM_IMAGE_SIZE=0x16000
 	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
-	payload /usr/share/etherboot/5.2.1eb1-lnxi-lb/tg3--ide_disk.zelf
-# use this to test a build if you don't have the etherboot
+	payload /home/ollie/work/filo-0.4.1/filo.elf
 #	payload /etc/hosts
 end
 
diff --git a/targets/ibm/e325/Config.lb b/targets/ibm/e325/Config.lb
index 0a9d6a02c2..709c1d853a 100644
--- a/targets/ibm/e325/Config.lb
+++ b/targets/ibm/e325/Config.lb
@@ -1,87 +1,9 @@
 # the IBM E325
 # This will make a target directory of ./e325
 
-loadoptions
-
 target e325
 
-uses ARCH
-uses CONFIG_COMPRESS
-uses CONFIG_IOAPIC
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
-uses CONFIG_SERIAL_POST
-uses NO_POST
-uses CONFIG_UDELAY_TSC
-uses CPU_FIXUP
-uses FALLBACK_SIZE
-uses HAVE_FALLBACK_BOOT
-uses HAVE_MP_TABLE
-uses HAVE_PIRQ_TABLE
-uses HAVE_HARD_RESET
-uses i586
-uses i686
-uses INTEL_PPRO_MTRR
-uses HEAP_SIZE
-uses IRQ_SLOT_COUNT
-uses k7
-uses k8
-uses MAINBOARD_PART_NUMBER
-uses MAINBOARD_VENDOR
-uses CONFIG_SMP
-uses CONFIG_MAX_CPUS
-uses MEMORY_HOLE
-uses PAYLOAD_SIZE
-uses _RAMBASE
-uses _ROMBASE
-uses ROM_IMAGE_SIZE
-uses ROM_SECTION_OFFSET
-uses ROM_SECTION_SIZE
-uses ROM_SIZE
-uses STACK_SIZE
-uses USE_FALLBACK_IMAGE
-uses USE_OPTION_TABLE
-uses HAVE_OPTION_TABLE
-uses MAXIMUM_CONSOLE_LOGLEVEL
-uses  DEFAULT_CONSOLE_LOGLEVEL
-uses  CONFIG_CONSOLE_SERIAL8250
-uses MAINBOARD
-uses CONFIG_CHIP_CONFIGURE
-uses XIP_ROM_SIZE
-uses XIP_ROM_BASE
-uses LINUXBIOS_EXTRA_VERSION
-
-option CONFIG_CHIP_CONFIGURE=1
-
-option  MAXIMUM_CONSOLE_LOGLEVEL=9
-option  DEFAULT_CONSOLE_LOGLEVEL=9
-option  CONFIG_CONSOLE_SERIAL8250=1
-option  CONFIG_SERIAL_POST=1
-option  NO_POST=0
-
-option CPU_FIXUP=1
-option CONFIG_UDELAY_TSC=0
-option i686=1
-option i586=1
-option INTEL_PPRO_MTRR=1
-option k7=1
-option k8=1
-
-option ROM_SIZE=1048576
-
-
-option HAVE_OPTION_TABLE=1
-option CONFIG_ROM_STREAM=1
-option HAVE_FALLBACK_BOOT=1
-
-###
-### Compute the location and size of where this firmware image
-### (linuxBIOS plus bootloader) will live in the boot rom chip.
-###
-option FALLBACK_SIZE=131072
-
-## LinuxBIOS C code runs at this location in RAM
-option _RAMBASE=0x00004000
+mainboard ibm/e325
 
 #
 ###
@@ -95,16 +17,16 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x10000
 	option LINUXBIOS_EXTRA_VERSION=".0Normal"
-	mainboard ibm/e325
-	payload ../../filo.elf
+#	payload ../../filo.elf
+        payload /home/ollie/work/filo-0.4.1/filo.elf
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
 	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
-	mainboard ibm/e325
-	payload ../../filo.elf
+#	payload ../../filo.elf
+        payload /home/ollie/work/filo-0.4.1/filo.elf
 # use this to test a build if you don't have the etherboot
 #	payload /etc/hosts
 end
diff --git a/targets/via/epia/Config.lb b/targets/via/epia/Config.lb
index ba4297d648..ff484d60ef 100644
--- a/targets/via/epia/Config.lb
+++ b/targets/via/epia/Config.lb
@@ -3,6 +3,12 @@
 
 target epia
 mainboard via/epia
+
+## Request this level of debugging output
+option DEFAULT_CONSOLE_LOGLEVEL=9
+## At a maximum only compile in this level of debugging
+option MAXIMUM_CONSOLE_LOGLEVEL=9
+
 #
 # Via Epia
 romimage "normal"
@@ -11,7 +17,9 @@ romimage "normal"
 	option LINUXBIOS_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
-	payload ../../../../../lnxieepro100.ebi
+#	payload ../../../../../lnxieepro100.ebi
+        payload /home/ollie/work/filo-0.4.1/filo.elf
+
 end
 
 romimage "fallback" 
@@ -20,7 +28,8 @@ romimage "fallback"
 	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
-	payload ../../../../../lnxieepro100.ebi
+#	payload ../../../../../lnxieepro100.ebi
+        payload /home/ollie/work/filo-0.4.1/filo.elf
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"