Apply linuxbios-rename-compressed-payload-options.patch, refs #14

Signed-off-by: Ed Swierk <eswierk@arastra.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


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

70 files changed, 103 insertions, 108 deletions

diff --git a/src/arch/i386/Config.lb b/src/arch/i386/Config.lb
index b5fcd90688..09eb1a22b8 100644
--- a/src/arch/i386/Config.lb
+++ b/src/arch/i386/Config.lb
@@ -1,5 +1,5 @@
 uses CONFIG_SMP
-uses CONFIG_PRECOMPRESSED_ROM_STREAM
+uses CONFIG_PRECOMPRESSED_PAYLOAD
 uses CONFIG_USE_INIT
 uses HAVE_FAILOVER_BOOT
 uses USE_FAILOVER_IMAGE
@@ -61,11 +61,11 @@ end
 makedefine PAYLOAD-1:=payload
 
 # match the case where a compression type is specified.
-makedefine PAYLOAD-$(CONFIG_COMPRESSED_ROM_STREAM_NRV2B):=payload.nrv2b
-makedefine PAYLOAD-$(CONFIG_COMPRESSED_ROM_STREAM_LZMA):=payload.lzma
+makedefine PAYLOAD-$(CONFIG_COMPRESSED_PAYLOAD_NRV2B):=payload.nrv2b
+makedefine PAYLOAD-$(CONFIG_COMPRESSED_PAYLOAD_LZMA):=payload.lzma
 
 # catch the case where there is precompression. Yes, this bites. 
-if CONFIG_PRECOMPRESSED_ROM_STREAM 
+if CONFIG_PRECOMPRESSED_PAYLOAD 
 	makedefine PAYLOAD-1:=payload
 end
 
diff --git a/src/config/Options.lb b/src/config/Options.lb
index e8c251497c..069125139b 100644
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -609,22 +609,17 @@ define CONFIG_ROM_STREAM_START
 	export always
 	comment "ROM stream start location"
 end
-define CONFIG_COMPRESSED_ROM_STREAM
-	default 0
-	export always
-	comment "compressed boot image is located in ROM and is assumed to be NRV2B (deprecated)" 
-end
-define CONFIG_COMPRESSED_ROM_STREAM_NRV2B
+define CONFIG_COMPRESSED_PAYLOAD_NRV2B
 	default 0
 	export always
 	comment "NRV2B compressed boot image is located in ROM" 
 end
-define CONFIG_COMPRESSED_ROM_STREAM_LZMA
+define CONFIG_COMPRESSED_PAYLOAD_LZMA
 	default 0
 	export always
 	comment "LZMA compressed boot image is located in ROM" 
 end
-define CONFIG_PRECOMPRESSED_ROM_STREAM
+define CONFIG_PRECOMPRESSED_PAYLOAD
 	default 0
 	export always
 	comment "boot image is already compressed" 
diff --git a/src/mainboard/agami/aruma/Options.lb b/src/mainboard/agami/aruma/Options.lb
index 5c13751fd6..8fdb3ea166 100644
--- a/src/mainboard/agami/aruma/Options.lb
+++ b/src/mainboard/agami/aruma/Options.lb
@@ -20,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/amd/quartet/Options.lb b/src/mainboard/amd/quartet/Options.lb
index db2686cd48..be344189f7 100644
--- a/src/mainboard/amd/quartet/Options.lb
+++ b/src/mainboard/amd/quartet/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/amd/rumba/Options.lb b/src/mainboard/amd/rumba/Options.lb
index 29ef3094ff..10ceae2aa6 100644
--- a/src/mainboard/amd/rumba/Options.lb
+++ b/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_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/amd/serenade/Options.lb b/src/mainboard/amd/serenade/Options.lb
index 1dfcdcec94..010b202a60 100644
--- a/src/mainboard/amd/serenade/Options.lb
+++ b/src/mainboard/amd/serenade/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/amd/serengeti_cheetah/Options.lb b/src/mainboard/amd/serengeti_cheetah/Options.lb
index f7df1e63e4..eda1ec5cdf 100644
--- a/src/mainboard/amd/serengeti_cheetah/Options.lb
+++ b/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_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/amd/serengeti_leopard/Options.lb b/src/mainboard/amd/serengeti_leopard/Options.lb
index 0806555287..65da4f5ffe 100644
--- a/src/mainboard/amd/serengeti_leopard/Options.lb
+++ b/src/mainboard/amd/serengeti_leopard/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_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/amd/solo/Options.lb b/src/mainboard/amd/solo/Options.lb
index e8636f8293..934a2ea42a 100644
--- a/src/mainboard/amd/solo/Options.lb
+++ b/src/mainboard/amd/solo/Options.lb
@@ -18,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/arima/hdama/Options.lb b/src/mainboard/arima/hdama/Options.lb
index ed0b80a174..a993e22624 100644
--- a/src/mainboard/arima/hdama/Options.lb
+++ b/src/mainboard/arima/hdama/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/artecgroup/dbe61/Options.lb b/src/mainboard/artecgroup/dbe61/Options.lb
index aa1cc0a324..d53a24f4ba 100644
--- a/src/mainboard/artecgroup/dbe61/Options.lb
+++ b/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_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/asus/p2b/Options.lb b/src/mainboard/asus/p2b/Options.lb
index a7fc28bbaa..e279926991 100644
--- a/src/mainboard/asus/p2b/Options.lb
+++ b/src/mainboard/asus/p2b/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_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/bitworks/ims/Options.lb b/src/mainboard/bitworks/ims/Options.lb
index 92a09c7919..bb4daaed8e 100644
--- a/src/mainboard/bitworks/ims/Options.lb
+++ b/src/mainboard/bitworks/ims/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_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/broadcom/blast/Options.lb b/src/mainboard/broadcom/blast/Options.lb
index cf14e1baaa..0b1dab38aa 100644
--- a/src/mainboard/broadcom/blast/Options.lb
+++ b/src/mainboard/broadcom/blast/Options.lb
@@ -19,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/dell/s1850/Options.lb b/src/mainboard/dell/s1850/Options.lb
index fb46537a1d..be726d7ca0 100644
--- a/src/mainboard/dell/s1850/Options.lb
+++ b/src/mainboard/dell/s1850/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/densitron/dpx114/Options.lb b/src/mainboard/densitron/dpx114/Options.lb
index 923c9922d6..6e5ef6c48b 100644
--- a/src/mainboard/densitron/dpx114/Options.lb
+++ b/src/mainboard/densitron/dpx114/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_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/digitallogic/adl855pc/Options.lb b/src/mainboard/digitallogic/adl855pc/Options.lb
index 6a66ed76bf..d03efe4cb3 100644
--- a/src/mainboard/digitallogic/adl855pc/Options.lb
+++ b/src/mainboard/digitallogic/adl855pc/Options.lb
@@ -22,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/digitallogic/msm586seg/Options.lb b/src/mainboard/digitallogic/msm586seg/Options.lb
index ed386f369a..dfee132b71 100644
--- a/src/mainboard/digitallogic/msm586seg/Options.lb
+++ b/src/mainboard/digitallogic/msm586seg/Options.lb
@@ -23,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/digitallogic/msm800sev/Options.lb b/src/mainboard/digitallogic/msm800sev/Options.lb
index 82f211580a..a525c76f17 100644
--- a/src/mainboard/digitallogic/msm800sev/Options.lb
+++ b/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_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/eaglelion/5bcm/Options.lb b/src/mainboard/eaglelion/5bcm/Options.lb
index 29ef3094ff..10ceae2aa6 100644
--- a/src/mainboard/eaglelion/5bcm/Options.lb
+++ b/src/mainboard/eaglelion/5bcm/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_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/embeddedplanet/ep405pc/Options.lb b/src/mainboard/embeddedplanet/ep405pc/Options.lb
index 2bede99d33..0da3af65c2 100644
--- a/src/mainboard/embeddedplanet/ep405pc/Options.lb
+++ b/src/mainboard/embeddedplanet/ep405pc/Options.lb
@@ -24,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses AUTOBOOT_CMDLINE
 uses CONFIG_SYS_CLK_FREQ
 uses IDE_BOOT_DRIVE
diff --git a/src/mainboard/emulation/qemu-i386/Options.lb b/src/mainboard/emulation/qemu-i386/Options.lb
index 82a82a539c..3047b22e6d 100644
--- a/src/mainboard/emulation/qemu-i386/Options.lb
+++ b/src/mainboard/emulation/qemu-i386/Options.lb
@@ -6,9 +6,9 @@ uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
 uses CONFIG_COMPRESS
-uses CONFIG_COMPRESSED_ROM_STREAM_NRV2B
-uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
-uses CONFIG_PRECOMPRESSED_ROM_STREAM
+uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
+uses CONFIG_PRECOMPRESSED_PAYLOAD
 uses CONFIG_ROM_STREAM
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
diff --git a/src/mainboard/ibm/e325/Options.lb b/src/mainboard/ibm/e325/Options.lb
index a732ae862e..56f5e5c693 100644
--- a/src/mainboard/ibm/e325/Options.lb
+++ b/src/mainboard/ibm/e325/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/ibm/e326/Options.lb b/src/mainboard/ibm/e326/Options.lb
index 495fa14f35..875d455198 100644
--- a/src/mainboard/ibm/e326/Options.lb
+++ b/src/mainboard/ibm/e326/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/iei/nova4899r/Options.lb b/src/mainboard/iei/nova4899r/Options.lb
index ba4b6f294d..be817ff267 100644
--- a/src/mainboard/iei/nova4899r/Options.lb
+++ b/src/mainboard/iei/nova4899r/Options.lb
@@ -41,9 +41,9 @@ uses CONFIG_UDELAY_TSC
 uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
-uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
-uses CONFIG_COMPRESSED_ROM_STREAM_NRV2B
-uses CONFIG_PRECOMPRESSED_ROM_STREAM
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
+uses CONFIG_PRECOMPRESSED_PAYLOAD
 
 ## ROM_SIZE is the size of boot ROM that this board will use.
 default ROM_SIZE  = 256*1024
diff --git a/src/mainboard/intel/jarrell/Options.lb b/src/mainboard/intel/jarrell/Options.lb
index 50fd795697..507d51dd59 100644
--- a/src/mainboard/intel/jarrell/Options.lb
+++ b/src/mainboard/intel/jarrell/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/intel/xe7501devkit/Options.lb b/src/mainboard/intel/xe7501devkit/Options.lb
index aaca1f01c7..3f100841b3 100644
--- a/src/mainboard/intel/xe7501devkit/Options.lb
+++ b/src/mainboard/intel/xe7501devkit/Options.lb
@@ -10,7 +10,7 @@ uses CONFIG_MAX_PHYSICAL_CPUS
 uses CONFIG_IOAPIC
 uses CONFIG_SMP
 uses CONFIG_ROM_STREAM
-uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses STACK_SIZE
 uses HEAP_SIZE
 uses USE_OPTION_TABLE
diff --git a/src/mainboard/iwill/dk8_htx/Options.lb b/src/mainboard/iwill/dk8_htx/Options.lb
index c9f4d48dbe..737e0fdbc2 100644
--- a/src/mainboard/iwill/dk8_htx/Options.lb
+++ b/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_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/iwill/dk8s2/Options.lb b/src/mainboard/iwill/dk8s2/Options.lb
index 60f3e438c0..d71e28e75d 100644
--- a/src/mainboard/iwill/dk8s2/Options.lb
+++ b/src/mainboard/iwill/dk8s2/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/iwill/dk8x/Options.lb b/src/mainboard/iwill/dk8x/Options.lb
index 6b9f6f01df..a5d5176b82 100644
--- a/src/mainboard/iwill/dk8x/Options.lb
+++ b/src/mainboard/iwill/dk8x/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/lippert/frontrunner/Options.lb b/src/mainboard/lippert/frontrunner/Options.lb
index 29ef3094ff..10ceae2aa6 100644
--- a/src/mainboard/lippert/frontrunner/Options.lb
+++ b/src/mainboard/lippert/frontrunner/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_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb b/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
index e28cb94507..f7970e4bdf 100644
--- a/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
+++ b/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
@@ -21,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses AUTOBOOT_CMDLINE
 uses PAYLOAD_SIZE
 uses ROM_SIZE
diff --git a/src/mainboard/msi/ms9185/Options.lb b/src/mainboard/msi/ms9185/Options.lb
index b08b65aca1..21856606a6 100644
--- a/src/mainboard/msi/ms9185/Options.lb
+++ b/src/mainboard/msi/ms9185/Options.lb
@@ -44,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/newisys/khepri/Options.lb b/src/mainboard/newisys/khepri/Options.lb
index 5a15cd09b6..b4f1275f40 100644
--- a/src/mainboard/newisys/khepri/Options.lb
+++ b/src/mainboard/newisys/khepri/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/olpc/btest/Options.lb b/src/mainboard/olpc/btest/Options.lb
index 36b0ab956f..623d85630e 100644
--- a/src/mainboard/olpc/btest/Options.lb
+++ b/src/mainboard/olpc/btest/Options.lb
@@ -21,9 +21,9 @@ 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 CONFIG_PRECOMPRESSED_ROM_STREAM
+uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
+uses CONFIG_PRECOMPRESSED_PAYLOAD
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/olpc/rev_a/Options.lb b/src/mainboard/olpc/rev_a/Options.lb
index 36b0ab956f..623d85630e 100644
--- a/src/mainboard/olpc/rev_a/Options.lb
+++ b/src/mainboard/olpc/rev_a/Options.lb
@@ -21,9 +21,9 @@ 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 CONFIG_PRECOMPRESSED_ROM_STREAM
+uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
+uses CONFIG_PRECOMPRESSED_PAYLOAD
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/sunw/ultra40/Options.lb b/src/mainboard/sunw/ultra40/Options.lb
index a904524fa2..957e658cf9 100644
--- a/src/mainboard/sunw/ultra40/Options.lb
+++ b/src/mainboard/sunw/ultra40/Options.lb
@@ -18,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/supermicro/x6dai_g/Options.lb b/src/mainboard/supermicro/x6dai_g/Options.lb
index fcfd38e5cc..c406eba944 100644
--- a/src/mainboard/supermicro/x6dai_g/Options.lb
+++ b/src/mainboard/supermicro/x6dai_g/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/supermicro/x6dhe_g/Options.lb b/src/mainboard/supermicro/x6dhe_g/Options.lb
index 3b284181db..00aaf8f146 100644
--- a/src/mainboard/supermicro/x6dhe_g/Options.lb
+++ b/src/mainboard/supermicro/x6dhe_g/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/supermicro/x6dhe_g2/Options.lb b/src/mainboard/supermicro/x6dhe_g2/Options.lb
index 3b284181db..00aaf8f146 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Options.lb
+++ b/src/mainboard/supermicro/x6dhe_g2/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/supermicro/x6dhr_ig/Options.lb b/src/mainboard/supermicro/x6dhr_ig/Options.lb
index fb46537a1d..be726d7ca0 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Options.lb
+++ b/src/mainboard/supermicro/x6dhr_ig/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Options.lb b/src/mainboard/supermicro/x6dhr_ig2/Options.lb
index fb46537a1d..be726d7ca0 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Options.lb
+++ b/src/mainboard/supermicro/x6dhr_ig2/Options.lb
@@ -17,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/technologic/ts5300/Options.lb b/src/mainboard/technologic/ts5300/Options.lb
index 2e7e63681b..0e203078fd 100644
--- a/src/mainboard/technologic/ts5300/Options.lb
+++ b/src/mainboard/technologic/ts5300/Options.lb
@@ -23,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/totalimpact/briq/Options.lb b/src/mainboard/totalimpact/briq/Options.lb
index 5a69147d83..660b6ce23e 100644
--- a/src/mainboard/totalimpact/briq/Options.lb
+++ b/src/mainboard/totalimpact/briq/Options.lb
@@ -19,7 +19,7 @@ uses CONFIG_USE_INIT
 uses NO_POST
 uses CONFIG_CONSOLE_SERIAL8250 
 uses CONFIG_IDE_STREAM 
-uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses IDE_BOOT_DRIVE
 uses IDE_SWAB IDE_OFFSET 
 uses ROM_SIZE
diff --git a/src/mainboard/tyan/s2735/Options.lb b/src/mainboard/tyan/s2735/Options.lb
index 2690b5b0d9..d5b5903a2d 100644
--- a/src/mainboard/tyan/s2735/Options.lb
+++ b/src/mainboard/tyan/s2735/Options.lb
@@ -19,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/tyan/s2850/Options.lb b/src/mainboard/tyan/s2850/Options.lb
index fefe9d9866..bfd04916fe 100644
--- a/src/mainboard/tyan/s2850/Options.lb
+++ b/src/mainboard/tyan/s2850/Options.lb
@@ -18,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/tyan/s2875/Options.lb b/src/mainboard/tyan/s2875/Options.lb
index 36061c453f..7048a186e6 100644
--- a/src/mainboard/tyan/s2875/Options.lb
+++ b/src/mainboard/tyan/s2875/Options.lb
@@ -18,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/tyan/s2880/Options.lb b/src/mainboard/tyan/s2880/Options.lb
index 7a6a8558f3..ee8d6df0ca 100644
--- a/src/mainboard/tyan/s2880/Options.lb
+++ b/src/mainboard/tyan/s2880/Options.lb
@@ -18,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/tyan/s2881/Options.lb b/src/mainboard/tyan/s2881/Options.lb
index 5e51946960..da51338cb8 100644
--- a/src/mainboard/tyan/s2881/Options.lb
+++ b/src/mainboard/tyan/s2881/Options.lb
@@ -18,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/tyan/s2882/Options.lb b/src/mainboard/tyan/s2882/Options.lb
index 11e1205adb..95cdd8a358 100644
--- a/src/mainboard/tyan/s2882/Options.lb
+++ b/src/mainboard/tyan/s2882/Options.lb
@@ -18,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/tyan/s2885/Options.lb b/src/mainboard/tyan/s2885/Options.lb
index 2f48ef0ed2..bbc4f00ed9 100644
--- a/src/mainboard/tyan/s2885/Options.lb
+++ b/src/mainboard/tyan/s2885/Options.lb
@@ -18,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/tyan/s2891/Options.lb b/src/mainboard/tyan/s2891/Options.lb
index 2fd91f19a0..3eafa9e6fc 100644
--- a/src/mainboard/tyan/s2891/Options.lb
+++ b/src/mainboard/tyan/s2891/Options.lb
@@ -18,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/tyan/s2892/Options.lb b/src/mainboard/tyan/s2892/Options.lb
index dd94661d72..e798e865a5 100644
--- a/src/mainboard/tyan/s2892/Options.lb
+++ b/src/mainboard/tyan/s2892/Options.lb
@@ -18,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/tyan/s2895/Options.lb b/src/mainboard/tyan/s2895/Options.lb
index 1ce9000bf1..426b239765 100644
--- a/src/mainboard/tyan/s2895/Options.lb
+++ b/src/mainboard/tyan/s2895/Options.lb
@@ -21,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/tyan/s4880/Options.lb b/src/mainboard/tyan/s4880/Options.lb
index 34c89f7dd0..a9493ed954 100644
--- a/src/mainboard/tyan/s4880/Options.lb
+++ b/src/mainboard/tyan/s4880/Options.lb
@@ -18,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/tyan/s4882/Options.lb b/src/mainboard/tyan/s4882/Options.lb
index 1235d8a856..b1cd548a10 100644
--- a/src/mainboard/tyan/s4882/Options.lb
+++ b/src/mainboard/tyan/s4882/Options.lb
@@ -18,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
diff --git a/src/mainboard/via/epia-m/Options.lb b/src/mainboard/via/epia-m/Options.lb
index 4489b2250a..60e7b22fab 100644
--- a/src/mainboard/via/epia-m/Options.lb
+++ b/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_LZMA
+uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/mainboard/via/epia/Options.lb b/src/mainboard/via/epia/Options.lb
index 6cd9691f5b..f80ceaa9e1 100644
--- a/src/mainboard/via/epia/Options.lb
+++ b/src/mainboard/via/epia/Options.lb
@@ -29,7 +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 CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
diff --git a/src/stream/rom_stream.c b/src/stream/rom_stream.c
index 5e5a1ed66d..2000c5f576 100644
--- a/src/stream/rom_stream.c
+++ b/src/stream/rom_stream.c
@@ -5,23 +5,23 @@
 #include <string.h>
 
 /* if they set the precompressed rom stream, they better have set a type */
-#if CONFIG_PRECOMPRESSED_ROM_STREAM && ((!CONFIG_COMPRESSED_ROM_STREAM) && (!CONFIG_COMPRESSED_ROM_STREAM_NRV2B) && (!CONFIG_COMPRESSED_ROM_STREAM_LZMA))
-#error "You set CONFIG_PRECOMPRESSED_ROM_STREAM but need to set CONFIG_COMPRESSED_ROM_STREAM (implies NRV2B, deprecated) or CONFIG_COMPRESSED_ROM_STREAM_NRV2B or CONFIG_COMPRESSED_ROM_STREAM_LZMA"
+#if CONFIG_PRECOMPRESSED_PAYLOAD && ((!CONFIG_COMPRESSED_PAYLOAD_NRV2B) && (!CONFIG_COMPRESSED_PAYLOAD_LZMA))
+#error "You set CONFIG_PRECOMPRESSED_PAYLOAD but need to set CONFIG_COMPRESSED_PAYLOAD_NRV2B or CONFIG_COMPRESSED_PAYLOAD_LZMA"
 #endif
 
 /* If they set ANY of these, then we're compressed */
-#if ((CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B) || (CONFIG_COMPRESSED_ROM_STREAM_LZMA))
+#if ((CONFIG_COMPRESSED_PAYLOAD_NRV2B) || (CONFIG_COMPRESSED_PAYLOAD_LZMA))
 #define UNCOMPRESSER 1
 extern unsigned char _heap, _eheap;
 #endif
 
-#if (CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B) 
+#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B) 
 #define HAVE_UNCOMPRESSER 1
 // include generic nrv2b
 #include "../lib/nrv2b.c"
 #endif
 
-#if (CONFIG_COMPRESSED_ROM_STREAM_LZMA)
+#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
 #if HAVE_UNCOMPRESSER
 #error "You're defining more than one compression type, which is not allowed (of course)"
 #endif
@@ -53,11 +53,11 @@ static const unsigned char *rom;
 unsigned long 
 uncompress(uint8_t * rom_start, uint8_t *dest )
 {
-#if (CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B) 
+#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B) 
 	unsigned long ilen; // used compressed stream length
 	return unrv2b(rom_start, dest, &ilen);
 #endif
-#if (CONFIG_COMPRESSED_ROM_STREAM_LZMA)
+#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
 	return ulzma(rom_start, dest);
 #endif
 }
diff --git a/src/stream/serial_stream.c b/src/stream/serial_stream.c
index b3af26b1db..5be6624ac4 100644
--- a/src/stream/serial_stream.c
+++ b/src/stream/serial_stream.c
@@ -5,16 +5,16 @@
 #include <string.h>
 
 /* if they set the precompressed rom stream, they better have set a type */
-#if CONFIG_PRECOMPRESSED_ROM_STREAM && ((!CONFIG_COMPRESSED_ROM_STREAM) && (!CONFIG_COMPRESSED_ROM_STREAM_NRV2B) && (!CONFIG_COMPRESSED_ROM_STREAM_LZMA))
-#error "You set CONFIG_PRECOMPRESSED_ROM_STREAM but need to set CONFIG_COMPRESSED_ROM_STREAM (implies NRV2B, deprecated) or CONFIG_COMPRESSED_ROM_STREAM_NRV2B or CONFIG_COMPRESSED_ROM_STREAM_LZMA"
+#if CONFIG_PRECOMPRESSED_PAYLOAD && ((!CONFIG_COMPRESSED_PAYLOAD_NRV2B) && (!CONFIG_COMPRESSED_PAYLOAD_LZMA))
+#error "You set CONFIG_PRECOMPRESSED_PAYLOAD but need to set CONFIG_COMPRESSED_PAYLOAD_NRV2B or CONFIG_COMPRESSED_PAYLOAD_LZMA"
 #endif
 
-#if (CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B) 
+#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B) 
 #define HAVE_UNCOMPRESSER 1
 #include "../lib/nrv2b.c"
 #endif
 
-#if (CONFIG_COMPRESSED_ROM_STREAM_LZMA)
+#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
 #if HAVE_UNCOMPRESSER
 #error "You're defining more than one compression type, which is not allowed (of course)"
 #endif
@@ -33,11 +33,11 @@ static int stream_max_bytes = 0x00800000;
 #if HAVE_UNCOMPRESSER
 static unsigned long uncompress(uint8_t *src, uint8_t *dest)
 {
-#if (CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B) 
+#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B) 
 	unsigned long ilen;
 	return unrv2b(src, dest, &ilen);
 #endif
-#if (CONFIG_COMPRESSED_ROM_STREAM_LZMA)
+#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
 	return ulzma(src, dest);
 #endif
 }
diff --git a/targets/artecgroup/dbe61/Config.lb b/targets/artecgroup/dbe61/Config.lb
index ae43f2ce96..418cae0f5a 100644
--- a/targets/artecgroup/dbe61/Config.lb
+++ b/targets/artecgroup/dbe61/Config.lb
@@ -3,7 +3,7 @@
 target dbe61
 mainboard artecgroup/dbe61
 
-option CONFIG_COMPRESSED_ROM_STREAM_NRV2B=0
+option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
 
 ## ROM_SIZE is the total number of bytes allocated for LinuxBIOS use
 ## (normal AND fallback images and payloads).
diff --git a/targets/digitallogic/msm800sev/Config.lb b/targets/digitallogic/msm800sev/Config.lb
index ac3b755700..91b6fac6b0 100644
--- a/targets/digitallogic/msm800sev/Config.lb
+++ b/targets/digitallogic/msm800sev/Config.lb
@@ -3,7 +3,7 @@
 target msm800sev
 mainboard digitallogic/msm800sev
 
-option CONFIG_COMPRESSED_ROM_STREAM_NRV2B=0
+option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
 
 ## ROM_SIZE is the total number of bytes allocated for LinuxBIOS use
 ## (normal AND fallback images and payloads).
diff --git a/targets/emulation/qemu-i386/Config.OLPC.lb b/targets/emulation/qemu-i386/Config.OLPC.lb
index d0d3004cac..255a520898 100644
--- a/targets/emulation/qemu-i386/Config.OLPC.lb
+++ b/targets/emulation/qemu-i386/Config.OLPC.lb
@@ -4,8 +4,8 @@ target qemu-i386-OLPC
 mainboard emulation/qemu-i386
 
 option ROM_SIZE=1024*1024 - (128 * 1024)
-option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1
-option CONFIG_PRECOMPRESSED_ROM_STREAM=0
+option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
+option CONFIG_PRECOMPRESSED_PAYLOAD=0
 
 option CC="gcc -m32"
 
diff --git a/targets/iei/nova4899r/Config.lb b/targets/iei/nova4899r/Config.lb
index 98cd6667c9..8573e8a179 100644
--- a/targets/iei/nova4899r/Config.lb
+++ b/targets/iei/nova4899r/Config.lb
@@ -7,9 +7,9 @@ mainboard iei/nova4899r
 #option ROM_SIZE=256*1024
 
 #from OLPC definitions
-option CONFIG_COMPRESSED_ROM_STREAM_NRV2B=1
-#option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1
-#option CONFIG_PRECOMPRESSED_ROM_STREAM=0
+option CONFIG_COMPRESSED_PAYLOAD_NRV2B=1
+#option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
+#option CONFIG_PRECOMPRESSED_PAYLOAD=0
 # leave 128k for vsa and 32k for VGA code
 option ROM_SIZE=(256*1024)-(128*1024)-(32*1024)
 option FALLBACK_SIZE=ROM_SIZE
diff --git a/targets/iwill/dk8_htx/Config-abuild.lb b/targets/iwill/dk8_htx/Config-abuild.lb
index 757df110eb..c602910a75 100644
--- a/targets/iwill/dk8_htx/Config-abuild.lb
+++ b/targets/iwill/dk8_htx/Config-abuild.lb
@@ -7,7 +7,7 @@ option CC="gcc -m32"
 option CROSS_COMPILE=""
 option HOSTCC="gcc"
 
-option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1
+option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
diff --git a/targets/olpc/btest/Config.lb b/targets/olpc/btest/Config.lb
index f7c971c8c0..66b1360457 100644
--- a/targets/olpc/btest/Config.lb
+++ b/targets/olpc/btest/Config.lb
@@ -4,9 +4,9 @@ target btest
 mainboard olpc/btest
 
 # Don't let LinuxBIOS compress the payload
-#option CONFIG_COMPRESSED_ROM_STREAM_NRV2B=0
-#option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1
-#option CONFIG_PRECOMPRESSED_ROM_STREAM=0
+#option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
+#option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
+#option CONFIG_PRECOMPRESSED_PAYLOAD=0
 
 # leave 64k for vsa and 64k for EC code
 option ROM_SIZE=(1024*1024)-(64*1024)-(64*1024)
diff --git a/targets/olpc/rev_a/Config.1M.lb b/targets/olpc/rev_a/Config.1M.lb
index d3c748dedd..507d7da595 100644
--- a/targets/olpc/rev_a/Config.1M.lb
+++ b/targets/olpc/rev_a/Config.1M.lb
@@ -4,8 +4,8 @@ target rev_a_1M
 mainboard olpc/rev_a
 
 # Don't let LinuxBIOS compress the payload
-# option CONFIG_COMPRESSED_ROM_STREAM_NRV2B=0
-#option CONFIG_PRECOMPRESSED_ROM_STREAM=1
+# option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
+#option CONFIG_PRECOMPRESSED_PAYLOAD=1
 
 # leave 64k for vsa
 option ROM_SIZE=(1024*1024)-(64*1024)
diff --git a/targets/olpc/rev_a/Config.SPI.lb b/targets/olpc/rev_a/Config.SPI.lb
index b7d0199a38..3b8d5be23f 100644
--- a/targets/olpc/rev_a/Config.SPI.lb
+++ b/targets/olpc/rev_a/Config.SPI.lb
@@ -4,9 +4,9 @@ target rev_a_1M
 mainboard olpc/rev_a
 
 # Don't let LinuxBIOS compress the payload
-#option CONFIG_COMPRESSED_ROM_STREAM_NRV2B=0
-#option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1
-#option CONFIG_PRECOMPRESSED_ROM_STREAM=0
+#option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
+#option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
+#option CONFIG_PRECOMPRESSED_PAYLOAD=0
 
 # leave 64k for vsa and 64k for EC code
 option ROM_SIZE=(1024*1024)-(64*1024)-(64*1024)
diff --git a/targets/olpc/rev_a/Config.lb b/targets/olpc/rev_a/Config.lb
index da46f84a42..af2e4e07d1 100644
--- a/targets/olpc/rev_a/Config.lb
+++ b/targets/olpc/rev_a/Config.lb
@@ -4,7 +4,7 @@ target rev_a
 mainboard olpc/rev_a
 
 # leave 64k for vsa
-option CONFIG_COMPRESSED_ROM_STREAM_NRV2B=0
+option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
 option ROM_SIZE=512*1024-64*1024
 option FALLBACK_SIZE=ROM_SIZE
 
diff --git a/targets/via/epia-m/Config.lb b/targets/via/epia-m/Config.lb
index bc46e26b73..0bc5779288 100644
--- a/targets/via/epia-m/Config.lb
+++ b/targets/via/epia-m/Config.lb
@@ -13,8 +13,8 @@ option ROM_SIZE=256*1024
 option HAVE_OPTION_TABLE=1
 option CONFIG_ROM_STREAM=1
 option HAVE_FALLBACK_BOOT=1
-#option CONFIG_COMPRESSED_ROM_STREAM=1
-option CONFIG_COMPRESSED_ROM_STREAM=0
+#option CONFIG_COMPRESSED_PAYLOAD_NRV2B=1
+option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
 
 
 ###