* fix the automatic build system by compressing payloads if possible

and leaving enough room for a real payload (not /dev/null)

  This is a wonderful example why "uses" sucks.

* add Config-abuild.lb for those boards that dont build with 
  the default settings and a real payload:
  arima/hdama, amd/quartet, amd/serengeti_cheetah, ibm/e326

* if lzma is installed and a real payload is used, try compressing
  it. 

* fix a small bug in "abuild --help"

This patch is acked by me because its due to infrastructural changes only.
Flames welcome.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



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

src/mainboard/agami/aruma/Options.lb

@@ -20,6 +20,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/amd/quartet/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/amd/rumba/Options.lb

@@ -21,7 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
-uses CONFIG_COMPRESSED_ROM_STREAM_NRV2B
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

src/mainboard/amd/serenade/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/amd/serengeti_cheetah/Options.lb

@@ -23,7 +23,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
-uses CONFIG_COMPRESSED_ROM_STREAM
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -267,8 +267,6 @@ default _RAMBASE=0x00100000
 ##
 default CONFIG_ROM_STREAM = 1
 
-#default CONFIG_COMPRESSED_ROM_STREAM = 1
-
 ###
 ### Defaults of options that you may want to override in the target config file
 ### 

src/mainboard/amd/serengeti_leopard/Options.lb

@@ -23,6 +23,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/amd/solo/Options.lb

@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/arima/hdama/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/artecgroup/dbe61/Options.lb

@@ -21,7 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
-uses CONFIG_COMPRESSED_ROM_STREAM_NRV2B
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

src/mainboard/asus/p2b/Options.lb

@@ -21,6 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

src/mainboard/bitworks/ims/Options.lb

@@ -21,6 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

src/mainboard/broadcom/blast/Options.lb

@@ -19,6 +19,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/dell/s1850/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/densitron/dpx114/Options.lb

@@ -21,6 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

src/mainboard/digitallogic/adl855pc/Options.lb

@@ -22,6 +22,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

src/mainboard/digitallogic/msm586seg/Options.lb

@@ -23,6 +23,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

src/mainboard/digitallogic/msm800sev/Options.lb

@@ -21,7 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
-uses CONFIG_COMPRESSED_ROM_STREAM_NRV2B
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

src/mainboard/eaglelion/5bcm/Options.lb

@@ -21,6 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

src/mainboard/embeddedplanet/ep405pc/Options.lb

@@ -24,6 +24,7 @@ uses CONFIG_FS_STREAM
 uses CONFIG_FS_EXT2
 uses CONFIG_FS_ISO9660
 uses CONFIG_FS_FAT
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses AUTOBOOT_CMDLINE
 uses CONFIG_SYS_CLK_FREQ
 uses IDE_BOOT_DRIVE

src/mainboard/ibm/e325/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/ibm/e326/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/intel/jarrell/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/intel/xe7501devkit/Options.lb

@@ -10,6 +10,7 @@ uses CONFIG_MAX_PHYSICAL_CPUS
 uses CONFIG_IOAPIC
 uses CONFIG_SMP
 uses CONFIG_ROM_STREAM
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses STACK_SIZE
 uses HEAP_SIZE
 uses USE_OPTION_TABLE

src/mainboard/iwill/dk8_htx/Options.lb

@@ -23,7 +23,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
-uses CONFIG_COMPRESSED_ROM_STREAM
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -266,8 +266,6 @@ default _RAMBASE=0x00100000
 ##
 default CONFIG_ROM_STREAM = 1
 
-#default CONFIG_COMPRESSED_ROM_STREAM = 1
-
 ###
 ### Defaults of options that you may want to override in the target config file
 ### 

src/mainboard/iwill/dk8s2/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/iwill/dk8x/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/lippert/frontrunner/Options.lb

@@ -21,6 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb

@@ -21,6 +21,7 @@ uses CONFIG_FS_STREAM
 uses CONFIG_FS_EXT2
 uses CONFIG_FS_ISO9660
 uses CONFIG_FS_FAT
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses AUTOBOOT_CMDLINE
 uses PAYLOAD_SIZE
 uses ROM_SIZE

src/mainboard/msi/ms9185/Options.lb

@@ -44,6 +44,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/newisys/khepri/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/sunw/ultra40/Options.lb

@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/supermicro/x6dai_g/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/supermicro/x6dhe_g/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/supermicro/x6dhe_g2/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/supermicro/x6dhr_ig/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/supermicro/x6dhr_ig2/Options.lb

@@ -17,6 +17,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/technologic/ts5300/Options.lb

@@ -6,7 +6,6 @@ uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
 uses CONFIG_COMPRESS
-uses CONFIG_COMPRESSED_ROM_STREAM_NRV2B
 uses CONFIG_ROM_STREAM
 uses CONFIG_USE_INIT
 uses IRQ_SLOT_COUNT
@@ -24,6 +23,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
@@ -134,7 +134,6 @@ default USE_OPTION_TABLE = 0
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_COMPRESSED_ROM_STREAM_NRV2B     = 1
 default CONFIG_ROM_STREAM     = 1
 
 ##

src/mainboard/totalimpact/briq/Options.lb

@@ -19,6 +19,7 @@ uses CONFIG_USE_INIT
 uses NO_POST
 uses CONFIG_CONSOLE_SERIAL8250 
 uses CONFIG_IDE_STREAM 
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses IDE_BOOT_DRIVE
 uses IDE_SWAB IDE_OFFSET 
 uses ROM_SIZE

src/mainboard/tyan/s2735/Options.lb

@@ -19,6 +19,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/tyan/s2850/Options.lb

@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/tyan/s2875/Options.lb

@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/tyan/s2880/Options.lb

@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/tyan/s2881/Options.lb

@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/tyan/s2882/Options.lb

@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/tyan/s2885/Options.lb

@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/tyan/s2891/Options.lb

@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/tyan/s2892/Options.lb

@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/tyan/s2895/Options.lb

@@ -21,6 +21,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/tyan/s4880/Options.lb

@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/tyan/s4882/Options.lb

@@ -18,6 +18,7 @@ uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE

src/mainboard/via/epia-m/Options.lb

@@ -21,7 +21,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
-uses CONFIG_COMPRESSED_ROM_STREAM_NRV2B
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

src/mainboard/via/epia/Options.lb

@@ -29,6 +29,7 @@ uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
 uses CONFIG_ROM_STREAM_START
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE

targets/amd/quartet/Config-abuild.lb

@@ -0,0 +1,28 @@
+# This will make a target directory of ./VENDOR_MAINBOARD
+
+target VENDOR_MAINBOARD
+mainboard VENDOR/MAINBOARD
+
+option CC="CROSSCC"
+option CROSS_COMPILE="CROSS_PREFIX"
+option HOSTCC="CROSS_HOSTCC"
+
+__COMPRESSION__
+
+option ROM_SIZE=512*1024
+
+
+romimage "normal"
+	option USE_FALLBACK_IMAGE=0
+	option ROM_IMAGE_SIZE=0x20000
+	option LINUXBIOS_EXTRA_VERSION=".0-normal"
+	payload PAYLOAD
+end
+
+romimage "fallback" 
+	option USE_FALLBACK_IMAGE=1
+	option ROM_IMAGE_SIZE=0x20000
+	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+	payload PAYLOAD
+end
+buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"

targets/amd/serengeti_cheetah/Config-abuild.lb

@@ -0,0 +1,27 @@
+# This will make a target directory of ./VENDOR_MAINBOARD
+
+target VENDOR_MAINBOARD
+mainboard VENDOR/MAINBOARD
+
+option CC="CROSSCC"
+option CROSS_COMPILE="CROSS_PREFIX"
+option HOSTCC="CROSS_HOSTCC"
+
+__COMPRESSION__
+
+option ROM_SIZE=512*1024
+
+romimage "normal"
+	option USE_FALLBACK_IMAGE=0
+	option ROM_IMAGE_SIZE=0x20000
+	option LINUXBIOS_EXTRA_VERSION=".0-normal"
+	payload PAYLOAD
+end
+
+romimage "fallback" 
+	option USE_FALLBACK_IMAGE=1
+	option ROM_IMAGE_SIZE=0x20000
+	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+	payload PAYLOAD
+end
+buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"

targets/arima/hdama/Config-abuild.lb

@@ -0,0 +1,27 @@
+# This will make a target directory of ./VENDOR_MAINBOARD
+
+target VENDOR_MAINBOARD
+mainboard VENDOR/MAINBOARD
+
+option CC="CROSSCC"
+option CROSS_COMPILE="CROSS_PREFIX"
+option HOSTCC="CROSS_HOSTCC"
+
+__COMPRESSION__
+
+option ROM_SIZE=512*1024
+
+romimage "normal"
+	option USE_FALLBACK_IMAGE=0
+	option ROM_IMAGE_SIZE=0x20000
+	option LINUXBIOS_EXTRA_VERSION=".0-normal"
+	payload PAYLOAD
+end
+
+romimage "fallback" 
+	option USE_FALLBACK_IMAGE=1
+	option ROM_IMAGE_SIZE=0x20000
+	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+	payload PAYLOAD
+end
+buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"

targets/digitallogic/msm586seg/Config-abuild.lb

@@ -7,14 +7,9 @@ option DEFAULT_CONSOLE_LOGLEVEL=10
 option MAXIMUM_CONSOLE_LOGLEVEL=10
 option CONFIG_COMPRESS=0
 
-option CONFIG_CONSOLE_VGA=1
+__COMPRESSION__
 
-#romimage "normal"
-#	option USE_FALLBACK_IMAGE=0
-#	option ROM_IMAGE_SIZE=0x10000
-#	option LINUXBIOS_EXTRA_VERSION=".0Normal"
-#	payload /etc/hosts
-#end
+option CONFIG_CONSOLE_VGA=1
 
 romimage "fallback" 
 	option FALLBACK_SIZE = 256 * 1024
@@ -25,7 +20,7 @@ romimage "fallback"
 	option ROM_IMAGE_SIZE=128 * 1024 # 0x10000
 #	option ROM_IMAGE_SIZE=512 * 1024 # 0x10000
 	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
-	payload /dev/null
+	payload PAYLOAD
 end
 
 buildrom ./linuxbios.rom ROM_SIZE  "fallback"

targets/emulation/qemu-i386/Config-abuild.lb

@@ -3,6 +3,8 @@
 target emulation_qemu-i386
 mainboard emulation/qemu-i386
 
+__COMPRESSION__
+
 option ROM_SIZE=256*1024
 
 option CC="gcc -m32"

targets/ibm/e326/Config-abuild.lb

@@ -0,0 +1,27 @@
+# This will make a target directory of ./VENDOR_MAINBOARD
+
+target VENDOR_MAINBOARD
+mainboard VENDOR/MAINBOARD
+
+option CC="CROSSCC"
+option CROSS_COMPILE="CROSS_PREFIX"
+option HOSTCC="CROSS_HOSTCC"
+
+__COMPRESSION__
+
+option ROM_SIZE=512*1024
+
+romimage "normal"
+	option USE_FALLBACK_IMAGE=0
+	option ROM_IMAGE_SIZE=0x20000
+	option LINUXBIOS_EXTRA_VERSION=".0-normal"
+	payload PAYLOAD
+end
+
+romimage "fallback" 
+	option USE_FALLBACK_IMAGE=1
+	option ROM_IMAGE_SIZE=0x20000
+	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+	payload PAYLOAD
+end
+buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"

targets/technologic/ts5300/Config-abuild.lb

@@ -1,20 +1,13 @@
 target technologic_ts5300
 mainboard technologic/ts5300
 
-
-
 option DEFAULT_CONSOLE_LOGLEVEL=10
 option MAXIMUM_CONSOLE_LOGLEVEL=10
 option CONFIG_COMPRESS=0
 
-option CONFIG_CONSOLE_VGA=1
+__COMPRESSION__
 
-#romimage "normal"
-#	option USE_FALLBACK_IMAGE=0
-#	option ROM_IMAGE_SIZE=0x10000
-#	option LINUXBIOS_EXTRA_VERSION=".0Normal"
-#	payload /etc/hosts
-#end
+option CONFIG_CONSOLE_VGA=1
 
 romimage "fallback" 
 	option FALLBACK_SIZE = 256 * 1024
@@ -23,9 +16,8 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 #	option ROM_IMAGE_SIZE=32 * 1024 # 0x8000
 	option ROM_IMAGE_SIZE=128 * 1024 # 0x10000
-#	option ROM_IMAGE_SIZE=512 * 1024 # 0x10000
 	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
-	payload /dev/null
+	payload PAYLOAD
 end
 
 buildrom ./linuxbios.rom ROM_SIZE  "fallback"

targets/via/epia-m/Config-abuild.lb

@@ -7,6 +7,8 @@ option  MAXIMUM_CONSOLE_LOGLEVEL=8
 option  DEFAULT_CONSOLE_LOGLEVEL=8
 option  CONFIG_CONSOLE_SERIAL8250=1
 
+__COMPRESSION__
+
 option ROM_SIZE=256*1024
 
 option HAVE_OPTION_TABLE=1

util/abuild/abuild

@@ -105,10 +105,14 @@ function create_config
 	TARGCONFIG=$LBROOT/targets/$VENDOR/$MAINBOARD/Config-abuild.lb
 
         # get a working payload for the board if we have one.
+        # the --payload option expects a directory containing 
+	# an executable shell script payload.sh
+	#   Usage: payload.sh [VENDOR] [DEVICE]
+	# the script returns an absolute path to the payload binary.
 
 	if [ -x $payloads/payload.sh ]; then
 		PAYLOAD=`$payloads/payload.sh $VENDOR $MAINBOARD`
-		printf "Using custom payload $PAYLOAD\n"
+		printf "Using payload $PAYLOAD\n"
 	fi
 	
 	mkdir -p $TARGET
@@ -131,19 +135,21 @@ option CC="CROSSCC"
 option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
+__COMPRESSION__
+
 EOF
 		if [ "$TARCH" == i386 ] ; then
 			cat <<EOF
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x20000
+	option ROM_IMAGE_SIZE=0x16000
 	option LINUXBIOS_EXTRA_VERSION=".0-normal"
 	payload PAYLOAD
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x20000
+	option ROM_IMAGE_SIZE=0x16000
 	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
 	payload PAYLOAD
 end
@@ -161,14 +167,20 @@ EOF
 		) > $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
 	fi
 
+	if [ "`which lzma`" != "" -a "$PAYLOAD" != /dev/null ]; then
+		COMPRESSION="option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1"
+	else
+		COMPRESSION="# no compression"
+	fi
+
 	sed -i.pre -e s,VENDOR,$VENDOR,g \
 		-e s,MAINBOARD,$MAINBOARD,g \
 		-e s,payload\ PAYLOAD,payload\ $PAYLOAD,g \
 		-e s,CROSSCC,"$CC",g \
 		-e s,CROSS_PREFIX,"$CROSS_COMPILE",g \
 		-e s,CROSS_HOSTCC,"$HOSTCC",g \
+		-e s,__COMPRESSION__,"$COMPRESSION",g \
 		$TARGET/Config-${VENDOR}_${MAINBOARD}.lb
-		
 	printf " ok\n"
 }
 
@@ -422,8 +434,8 @@ function myhelp
 {
 	printf "Usage: $0 [-v] [-a] [-b] [-t <vendor/board>] [-p <dir>] [lbroot]\n"
 	printf "       $0 [-V|--version]\n"
-	printf "       $0 [-h|--help]\n"
-	printf
+	printf "       $0 [-h|--help]\n\n"
+
 	printf "Options:\n"
 	printf "    [-v|--verbose]		  print more messages\n"
 	printf "    [-a|--all]			  build previously succeeded ports as well\n"