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 <patrick.georgi@coresystems.de>
Acked-by: Myles Watson <mylesgw@gmail.com>




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

src/mainboard/emulation/qemu-x86/Options.lb

@@ -50,7 +50,7 @@ uses CONFIG_CBFS
 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

src/mainboard/kontron/986lcd-m/Options.lb

@@ -327,7 +327,7 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
 #
 # CBFS
 # 
-default CONFIG_CBFS=0
+default CONFIG_CBFS=1
 
 ### End Options.lb
 end

targets/kontron/986lcd-m/Config-abuild.lb

@@ -10,19 +10,22 @@ option HOSTCC="CROSS_HOSTCC"
 __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