* 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