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

10 files changed, 19 insertions, 19 deletions

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
 
 
 ###