[v2] r4212 - in trunk/coreboot-v2: src/mainboard/emulation/qemu-x86 src/mainboard/kontron/986lcd-m targets/kontron/986lcd-m

Author: oxygene
Date: 2009-04-26 00:15:29 +0200 (Sun, 26 Apr 2009)
New Revision: 4212

Modified:
   trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Options.lb
   trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Options.lb
   trunk/coreboot-v2/targets/kontron/986lcd-m/Config-abuild.lb
Log:
Enable CBFS for qemu and kontron. Both are builds-and-runs
tested, incl. optionrom-in-cbfs for kontron, and compressed payloads
for both.

Signed-off-by: Patrick Georgi 
Acked-by: Myles Watson

Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Options.lb	2009-04-25 22:07:28 UTC (rev 4211)
+++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Options.lb	2009-04-25 22:15:29 UTC (rev 4212)
@@ -50,7 +50,7 @@
 default CONFIG_CONSOLE_SERIAL8250=1
 default DEFAULT_CONSOLE_LOGLEVEL=8
 default MAXIMUM_CONSOLE_LOGLEVEL=8
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1

## ROM_SIZE is the size of boot ROM that this board will use.
 default ROM_SIZE  = 256*1024

Modified: trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Options.lb	2009-04-25 22:07:28 UTC (rev 4211)
+++ trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Options.lb	2009-04-25 22:15:29 UTC (rev 4212)
@@ -327,7 +327,7 @@
 #
 # CBFS
 # 
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1

### End Options.lb
 end

Modified: trunk/coreboot-v2/targets/kontron/986lcd-m/Config-abuild.lb
===================================================================
--- trunk/coreboot-v2/targets/kontron/986lcd-m/Config-abuild.lb	2009-04-25 22:07:28 UTC (rev 4211)
+++ trunk/coreboot-v2/targets/kontron/986lcd-m/Config-abuild.lb	2009-04-25 22:15:29 UTC (rev 4212)
@@ -10,19 +10,22 @@
 __COMPRESSION__
 __LOGLEVEL__

-option ROM_SIZE=1024*(1024-64)
+option ROM_SIZE=1024*1024
 option FALLBACK_SIZE=1024*512

+# add optionroms with:
+# coreboot-builds/kontron_986lcd-m/cbfstool coreboot-builds/kontron_986lcd-m/coreboot.rom add $pathto/pci8086,27a2.rom pci8086,27a2.rom 0x30
+
 romimage "normal"
    option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x19000
+	option ROM_IMAGE_SIZE=0x1a000
    option COREBOOT_EXTRA_VERSION=".0-normal"
    payload __PAYLOAD__
 end

romimage "fallback" 
    option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x19000
+	option ROM_IMAGE_SIZE=0x1a000
    option COREBOOT_EXTRA_VERSION=".0-fallback"
    payload __PAYLOAD__
 end