Apply linuxbios-rename-other-payload-options.patch

(Patch 2, 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@2529 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

12 files changed, 19 insertions, 19 deletions

diff --git a/targets/arima/hdama/Config.kernelimage.lb b/targets/arima/hdama/Config.kernelimage.lb
index a80eb2b9a5..878489819d 100644
--- a/targets/arima/hdama/Config.kernelimage.lb
+++ b/targets/arima/hdama/Config.kernelimage.lb
@@ -9,8 +9,8 @@ target hdama
 uses ARCH
 uses CONFIG_COMPRESS
 uses CONFIG_IOAPIC
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses CONFIG_UDELAY_TSC
 uses CPU_FIXUP
 uses FALLBACK_SIZE
@@ -68,7 +68,7 @@ option ROM_SIZE=1024*1024
 
 
 option HAVE_OPTION_TABLE=1
-option CONFIG_ROM_STREAM=1
+option CONFIG_ROM_PAYLOAD=1
 option HAVE_FALLBACK_BOOT=1
 
 ###
diff --git a/targets/embeddedplanet/ep405pc/Config.lb b/targets/embeddedplanet/ep405pc/Config.lb
index f434bfaf95..659c7c276f 100644
--- a/targets/embeddedplanet/ep405pc/Config.lb
+++ b/targets/embeddedplanet/ep405pc/Config.lb
@@ -32,7 +32,7 @@ romimage "normal"
 
         ## Boot linux from IDE
         option CONFIG_IDE=1
-        option CONFIG_FS_STREAM=1
+        option CONFIG_FS_PAYLOAD=1
         option CONFIG_FS_EXT2=1
         option CONFIG_FS_ISO9660=1
         option CONFIG_FS_FAT=1
diff --git a/targets/iwill/dk8s2/Config.lb b/targets/iwill/dk8s2/Config.lb
index 6d01b31f08..ced9197fd5 100644
--- a/targets/iwill/dk8s2/Config.lb
+++ b/targets/iwill/dk8s2/Config.lb
@@ -119,7 +119,7 @@ option HEAP_SIZE=0xe000
 ### Compute the start location and size size of
 ### The linuxBIOS bootloader.
 ###
-option CONFIG_ROM_STREAM     = 1
+option CONFIG_ROM_PAYLOAD     = 1
 
 #
 # 
@@ -134,8 +134,8 @@ romimage "normal"
 	option ROM_SECTION_OFFSET= 0
 
 	option PAYLOAD_SIZE            = (ROM_SECTION_SIZE - ROM_IMAGE_SIZE)
-	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
+	option CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+	option _ROMBASE      = (CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE)
 
 #	option XIP_ROM_SIZE = FALLBACK_SIZE
         option XIP_ROM_SIZE = 65536
@@ -153,8 +153,8 @@ romimage "fallback"
 	option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE)
 
 	option PAYLOAD_SIZE            = (ROM_SECTION_SIZE - ROM_IMAGE_SIZE)
-	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
-	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
+	option CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+	option _ROMBASE      = (CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE)
 
 #	option XIP_ROM_SIZE = FALLBACK_SIZE
 	option XIP_ROM_SIZE = 65536
diff --git a/targets/motorola/sandpoint/Config.lb.ide_stream b/targets/motorola/sandpoint/Config.lb.ide_stream
index c9b77c36db..85b5c7792a 100644
--- a/targets/motorola/sandpoint/Config.lb.ide_stream
+++ b/targets/motorola/sandpoint/Config.lb.ide_stream
@@ -16,7 +16,7 @@ uses CONFIG_CHIP_CONFIGURE
 uses NO_POST
 uses CONFIG_CONSOLE_SERIAL8250 
 uses TTYS0_BASE 
-uses CONFIG_IDE_STREAM 
+uses CONFIG_IDE_PAYLOAD 
 uses IDE_BOOT_DRIVE
 uses IDE_SWAB IDE_OFFSET 
 uses ROM_SIZE
@@ -51,7 +51,7 @@ option CONFIG_CONSOLE_SERIAL8250=1
 option TTYS0_BASE=0x3f8
 
 ## Boot linux from IDE
-option CONFIG_IDE_STREAM=1
+option CONFIG_IDE_PAYLOAD=1
 option IDE_BOOT_DRIVE=0
 option IDE_SWAB=1
 option IDE_OFFSET=0
diff --git a/targets/newisys/khepri/Config.lb b/targets/newisys/khepri/Config.lb
index 7755066eff..a6ffad22b9 100644
--- a/targets/newisys/khepri/Config.lb
+++ b/targets/newisys/khepri/Config.lb
@@ -20,7 +20,7 @@ option  CONFIG_CONSOLE_SERIAL8250=1
 option ROM_SIZE=512*1024
 
 option HAVE_OPTION_TABLE=1
-option CONFIG_ROM_STREAM=1
+option CONFIG_ROM_PAYLOAD=1
 option HAVE_FALLBACK_BOOT=1
 
 option FALLBACK_SIZE=131072
diff --git a/targets/totalimpact/briq/Config.lb b/targets/totalimpact/briq/Config.lb
index 0e16ec3787..08890634a4 100644
--- a/targets/totalimpact/briq/Config.lb
+++ b/targets/totalimpact/briq/Config.lb
@@ -19,7 +19,7 @@ option DEFAULT_CONSOLE_LOGLEVEL=8
 option CONFIG_CONSOLE_SERIAL8250=1
 
 ## Boot linux from IDE
-option CONFIG_IDE_STREAM=1
+option CONFIG_IDE_PAYLOAD=1
 option IDE_BOOT_DRIVE=0
 option IDE_SWAB=1
 option IDE_OFFSET=0
diff --git a/targets/via/epia-m/Config-abuild.lb b/targets/via/epia-m/Config-abuild.lb
index 194f25baca..42268f0eca 100644
--- a/targets/via/epia-m/Config-abuild.lb
+++ b/targets/via/epia-m/Config-abuild.lb
@@ -12,7 +12,7 @@ __COMPRESSION__
 option ROM_SIZE=256*1024
 
 option HAVE_OPTION_TABLE=1
-option CONFIG_ROM_STREAM=1
+option CONFIG_ROM_PAYLOAD=1
 option HAVE_FALLBACK_BOOT=1
 
 ###
diff --git a/targets/via/epia-m/Config.512kflash.lb b/targets/via/epia-m/Config.512kflash.lb
index 2c65687185..518df0c2dd 100644
--- a/targets/via/epia-m/Config.512kflash.lb
+++ b/targets/via/epia-m/Config.512kflash.lb
@@ -13,7 +13,7 @@ option ROM_SIZE=512*1024
 
 
 option HAVE_OPTION_TABLE=1
-option CONFIG_ROM_STREAM=1
+option CONFIG_ROM_PAYLOAD=1
 option HAVE_FALLBACK_BOOT=1
 
 ###
diff --git a/targets/via/epia-m/Config.etherboot.lb b/targets/via/epia-m/Config.etherboot.lb
index fea735586f..4a61fe6138 100644
--- a/targets/via/epia-m/Config.etherboot.lb
+++ b/targets/via/epia-m/Config.etherboot.lb
@@ -12,7 +12,7 @@ option  CONFIG_CONSOLE_SERIAL8250=1
 option ROM_SIZE=256*1024
 
 option HAVE_OPTION_TABLE=1
-option CONFIG_ROM_STREAM=1
+option CONFIG_ROM_PAYLOAD=1
 option HAVE_FALLBACK_BOOT=1
 
 ###
diff --git a/targets/via/epia-m/Config.filo.lb b/targets/via/epia-m/Config.filo.lb
index 3cdfe8c224..a00269c4fb 100644
--- a/targets/via/epia-m/Config.filo.lb
+++ b/targets/via/epia-m/Config.filo.lb
@@ -12,7 +12,7 @@ option  CONFIG_CONSOLE_SERIAL8250=1
 option ROM_SIZE=256*1024
 
 option HAVE_OPTION_TABLE=1
-option CONFIG_ROM_STREAM=1
+option CONFIG_ROM_PAYLOAD=1
 option HAVE_FALLBACK_BOOT=1
 
 ###
diff --git a/targets/via/epia-m/Config.lb b/targets/via/epia-m/Config.lb
index 0bc5779288..f086973295 100644
--- a/targets/via/epia-m/Config.lb
+++ b/targets/via/epia-m/Config.lb
@@ -11,7 +11,7 @@ option ROM_SIZE=256*1024
 
 
 option HAVE_OPTION_TABLE=1
-option CONFIG_ROM_STREAM=1
+option CONFIG_ROM_PAYLOAD=1
 option HAVE_FALLBACK_BOOT=1
 #option CONFIG_COMPRESSED_PAYLOAD_NRV2B=1
 option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
diff --git a/targets/via/epia-m/Config.vga.filo b/targets/via/epia-m/Config.vga.filo
index 6e58655067..6af2786c71 100644
--- a/targets/via/epia-m/Config.vga.filo
+++ b/targets/via/epia-m/Config.vga.filo
@@ -11,7 +11,7 @@ option  CONFIG_CONSOLE_SERIAL8250=1
 
 option ROM_SIZE=256*1024
 option HAVE_OPTION_TABLE=1
-option CONFIG_ROM_STREAM=1
+option CONFIG_ROM_PAYLOAD=1
 option HAVE_FALLBACK_BOOT=1
 
 ###