This is another fixup round for Yinghai Lu's great patch.

It does the ROM_STREAM -> PAYLOAD rename that afaik was done after
Yinghai sent his work to legal, so it is required to get that code
building.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



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

12 files changed, 44 insertions, 44 deletions

diff --git a/src/mainboard/gigabyte/m57sli/Config.lb b/src/mainboard/gigabyte/m57sli/Config.lb
index 96addbedd0..b6488a3402 100644
--- a/src/mainboard/gigabyte/m57sli/Config.lb
+++ b/src/mainboard/gigabyte/m57sli/Config.lb
@@ -41,12 +41,12 @@ end
 ## The linuxBIOS bootloader.
 ##
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 
 ##
 ## Compute where this copy of linuxBIOS will start in the boot rom
 ##
-default _ROMBASE      = ( CONFIG_ROM_STREAM_START + PAYLOAD_SIZE )
+default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
 
 ##
 ## Compute a range of ROM that can cached to speed up linuxBIOS,
diff --git a/src/mainboard/gigabyte/m57sli/Options.lb b/src/mainboard/gigabyte/m57sli/Options.lb
index bfa93903c9..95b205a045 100644
--- a/src/mainboard/gigabyte/m57sli/Options.lb
+++ b/src/mainboard/gigabyte/m57sli/Options.lb
@@ -42,11 +42,11 @@ uses ROM_SECTION_SIZE
 uses ROM_IMAGE_SIZE
 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 CONFIG_PRECOMPRESSED_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
+uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
+uses CONFIG_PRECOMPRESSED_PAYLOAD
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -286,9 +286,9 @@ default _RAMBASE=0x00100000
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
-#default CONFIG_COMPRESSED_ROM_STREAM = 1
+#default CONFIG_COMPRESSED_PAYLOAD_NRV2B = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff --git a/src/mainboard/nvidia/l1_2pvv/Config.lb b/src/mainboard/nvidia/l1_2pvv/Config.lb
index fa71479f03..dd5c68f0de 100644
--- a/src/mainboard/nvidia/l1_2pvv/Config.lb
+++ b/src/mainboard/nvidia/l1_2pvv/Config.lb
@@ -41,12 +41,12 @@ end
 ## The linuxBIOS bootloader.
 ##
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 
 ##
 ## Compute where this copy of linuxBIOS will start in the boot rom
 ##
-default _ROMBASE      = ( CONFIG_ROM_STREAM_START + PAYLOAD_SIZE )
+default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
 
 ##
 ## Compute a range of ROM that can cached to speed up linuxBIOS,
diff --git a/src/mainboard/nvidia/l1_2pvv/Options.lb b/src/mainboard/nvidia/l1_2pvv/Options.lb
index a5faf92d2a..b141deb3dd 100644
--- a/src/mainboard/nvidia/l1_2pvv/Options.lb
+++ b/src/mainboard/nvidia/l1_2pvv/Options.lb
@@ -42,11 +42,11 @@ uses ROM_SECTION_SIZE
 uses ROM_IMAGE_SIZE
 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 CONFIG_PRECOMPRESSED_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
+uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
+uses CONFIG_PRECOMPRESSED_PAYLOAD
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -286,9 +286,9 @@ default _RAMBASE=0x00100000
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
-#default CONFIG_COMPRESSED_ROM_STREAM = 1
+#default CONFIG_COMPRESSED_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff --git a/src/mainboard/supermicro/h8dmr/Config.lb b/src/mainboard/supermicro/h8dmr/Config.lb
index 57ad3c980f..95db836224 100644
--- a/src/mainboard/supermicro/h8dmr/Config.lb
+++ b/src/mainboard/supermicro/h8dmr/Config.lb
@@ -41,12 +41,12 @@ end
 ## The linuxBIOS bootloader.
 ##
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 
 ##
 ## Compute where this copy of linuxBIOS will start in the boot rom
 ##
-default _ROMBASE      = ( CONFIG_ROM_STREAM_START + PAYLOAD_SIZE )
+default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
 
 ##
 ## Compute a range of ROM that can cached to speed up linuxBIOS,
diff --git a/src/mainboard/supermicro/h8dmr/Options.lb b/src/mainboard/supermicro/h8dmr/Options.lb
index d796d4cd76..0e0cf7d9fb 100644
--- a/src/mainboard/supermicro/h8dmr/Options.lb
+++ b/src/mainboard/supermicro/h8dmr/Options.lb
@@ -42,11 +42,11 @@ uses ROM_SECTION_SIZE
 uses ROM_IMAGE_SIZE
 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 CONFIG_PRECOMPRESSED_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
+uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
+uses CONFIG_PRECOMPRESSED_PAYLOAD
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -283,9 +283,9 @@ default _RAMBASE=0x00100000
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
-#default CONFIG_COMPRESSED_ROM_STREAM = 1
+#default CONFIG_COMPRESSED_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff --git a/src/mainboard/tyan/s2912/Config.lb b/src/mainboard/tyan/s2912/Config.lb
index 814e2d4f0b..12e98e7589 100644
--- a/src/mainboard/tyan/s2912/Config.lb
+++ b/src/mainboard/tyan/s2912/Config.lb
@@ -41,12 +41,12 @@ end
 ## The linuxBIOS bootloader.
 ##
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 
 ##
 ## Compute where this copy of linuxBIOS will start in the boot rom
 ##
-default _ROMBASE      = ( CONFIG_ROM_STREAM_START + PAYLOAD_SIZE )
+default _ROMBASE      = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE )
 
 ##
 ## Compute a range of ROM that can cached to speed up linuxBIOS,
diff --git a/src/mainboard/tyan/s2912/Options.lb b/src/mainboard/tyan/s2912/Options.lb
index d661649d6f..577dd5369a 100644
--- a/src/mainboard/tyan/s2912/Options.lb
+++ b/src/mainboard/tyan/s2912/Options.lb
@@ -42,11 +42,11 @@ uses ROM_SECTION_SIZE
 uses ROM_IMAGE_SIZE
 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 CONFIG_PRECOMPRESSED_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
+uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
+uses CONFIG_COMPRESSED_PAYLOAD_LZMA
+uses CONFIG_PRECOMPRESSED_PAYLOAD
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -288,9 +288,9 @@ default _RAMBASE=0x00100000
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
-#default CONFIG_COMPRESSED_ROM_STREAM = 1
+#default CONFIG_COMPRESSED_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff --git a/targets/gigabyte/m57sli/Config.lb.kernel b/targets/gigabyte/m57sli/Config.lb.kernel
index 425f956266..7374a2c348 100644
--- a/targets/gigabyte/m57sli/Config.lb.kernel
+++ b/targets/gigabyte/m57sli/Config.lb.kernel
@@ -30,8 +30,8 @@ option FALLBACK_SIZE=(ROM_SIZE-0x1000)
 romimage "fallback" 
 	option USE_FAILOVER_IMAGE=0
 	option USE_FALLBACK_IMAGE=1
-	option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1
-	option CONFIG_PRECOMPRESSED_ROM_STREAM=1
+	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
+	option CONFIG_PRECOMPRESSED_PAYLOAD=1
 #	option ROM_IMAGE_SIZE=0x19800
 	option ROM_IMAGE_SIZE=0x17000
 #	option ROM_IMAGE_SIZE=0x15800
diff --git a/targets/nvidia/l1_2pvv/Config.lb.kernel b/targets/nvidia/l1_2pvv/Config.lb.kernel
index 639198fbeb..c8754ec052 100644
--- a/targets/nvidia/l1_2pvv/Config.lb.kernel
+++ b/targets/nvidia/l1_2pvv/Config.lb.kernel
@@ -32,8 +32,8 @@ option FALLBACK_SIZE=(ROM_SIZE-0x1000)
 romimage "fallback" 
 	option USE_FAILOVER_IMAGE=0
 	option USE_FALLBACK_IMAGE=1
-	option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1
-	option CONFIG_PRECOMPRESSED_ROM_STREAM=1
+	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
+	option CONFIG_PRECOMPRESSED_PAYLOAD=1
 #	option ROM_IMAGE_SIZE=0x19800
 	option ROM_IMAGE_SIZE=0x17000
 #	option ROM_IMAGE_SIZE=0x15800
diff --git a/targets/supermicro/h8dmr/Config.lb.kernel b/targets/supermicro/h8dmr/Config.lb.kernel
index 03168142e4..42e67cf06e 100644
--- a/targets/supermicro/h8dmr/Config.lb.kernel
+++ b/targets/supermicro/h8dmr/Config.lb.kernel
@@ -28,8 +28,8 @@ option FALLBACK_SIZE=(ROM_SIZE-0x1000)
 romimage "fallback" 
 	option USE_FAILOVER_IMAGE=0
 	option USE_FALLBACK_IMAGE=1
-	option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1
-	option CONFIG_PRECOMPRESSED_ROM_STREAM=1
+	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
+	option CONFIG_PRECOMPRESSED_PAYLOAD=1
 #	option ROM_IMAGE_SIZE=0x19800
 	option ROM_IMAGE_SIZE=0x18000
 #	option ROM_IMAGE_SIZE=0x15800
diff --git a/targets/tyan/s2912/Config.lb.kernel b/targets/tyan/s2912/Config.lb.kernel
index 861c59af34..b72621d18a 100644
--- a/targets/tyan/s2912/Config.lb.kernel
+++ b/targets/tyan/s2912/Config.lb.kernel
@@ -30,8 +30,8 @@ option FALLBACK_SIZE=(ROM_SIZE-0x1000)
 romimage "fallback" 
 	option USE_FAILOVER_IMAGE=0
 	option USE_FALLBACK_IMAGE=1
-	option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1
-	option CONFIG_PRECOMPRESSED_ROM_STREAM=1
+	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
+	option CONFIG_PRECOMPRESSED_PAYLOAD=1
 #	option ROM_IMAGE_SIZE=0x19800
 	option ROM_IMAGE_SIZE=0x17000
 #	option ROM_IMAGE_SIZE=0x15800