diff -BurN --exclude '*~' LinuxBIOSv2.orig1/documentation/LinuxBIOS-AMD64.tex LinuxBIOSv2/documentation/LinuxBIOS-AMD64.tex
--- LinuxBIOSv2.orig1/documentation/LinuxBIOS-AMD64.tex	2006-10-24 22:17:02.000000000 +0000
+++ LinuxBIOSv2/documentation/LinuxBIOS-AMD64.tex	2006-10-24 22:36:09.000000000 +0000
@@ -446,9 +446,9 @@
 your mainboard has CMOS memory and you want to use it to store
 LinuxBIOS parameters (Loglevel, serial line speed, ...)
 
-\item \begin{verbatim}CONFIG_ROM_STREAM\end{verbatim}
+\item \begin{verbatim}CONFIG_ROM_PAYLOAD\end{verbatim}
 
-Boot image is located in ROM (as opposed to \texttt{CONFIG\_IDE\_STREAM}, which
+Boot image is located in ROM (as opposed to \texttt{CONFIG\_IDE\_PAYLOAD}, which
 will boot from an IDE disk)
 
 \item \begin{verbatim}HAVE_FALLBACK_BOOT\end{verbatim}
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/documentation/RFC/config.tex LinuxBIOSv2/documentation/RFC/config.tex
--- LinuxBIOSv2.orig1/documentation/RFC/config.tex	2006-10-24 22:17:01.000000000 +0000
+++ LinuxBIOSv2/documentation/RFC/config.tex	2006-10-24 22:36:09.000000000 +0000
@@ -262,7 +262,7 @@
 ### The linuxBIOS bootloader.
 ###
 option PAYLOAD_SIZE            = (ROM_SECTION_SIZE - ROM_IMAGE_SIZE)
-option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+option CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 #
 
 \end{verbatim}
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/arch/i386/lib/failover_failover.lds LinuxBIOSv2/src/arch/i386/lib/failover_failover.lds
--- LinuxBIOSv2.orig1/src/arch/i386/lib/failover_failover.lds	2006-10-24 22:17:00.000000000 +0000
+++ LinuxBIOSv2/src/arch/i386/lib/failover_failover.lds	2006-10-24 22:36:09.000000000 +0000
@@ -1,2 +1,2 @@
-	__fallback_image = (CONFIG_ROM_STREAM_START & 0xfffffff0) - 8;
-	__normal_image = ((CONFIG_ROM_STREAM_START - FALLBACK_SIZE) & 0xfffffff0) - 8;
+	__fallback_image = (CONFIG_ROM_PAYLOAD_START & 0xfffffff0) - 8;
+	__normal_image = ((CONFIG_ROM_PAYLOAD_START - FALLBACK_SIZE) & 0xfffffff0) - 8;
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/arch/i386/lib/failover.lds LinuxBIOSv2/src/arch/i386/lib/failover.lds
--- LinuxBIOSv2.orig1/src/arch/i386/lib/failover.lds	2006-10-24 22:17:00.000000000 +0000
+++ LinuxBIOSv2/src/arch/i386/lib/failover.lds	2006-10-24 22:36:09.000000000 +0000
@@ -1 +1 @@
-	__normal_image = (CONFIG_ROM_STREAM_START & 0xfffffff0) - 8;
+	__normal_image = (CONFIG_ROM_PAYLOAD_START & 0xfffffff0) - 8;
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/boot/Config.lb LinuxBIOSv2/src/boot/Config.lb
--- LinuxBIOSv2.orig1/src/boot/Config.lb	2006-10-24 22:16:55.000000000 +0000
+++ LinuxBIOSv2/src/boot/Config.lb	2006-10-24 22:36:09.000000000 +0000
@@ -1,5 +1,5 @@
 object elfboot.o
 object hardwaremain.o
-if CONFIG_FS_STREAM
+if CONFIG_FS_PAYLOAD
 	object filo.o
 end
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/boot/hardwaremain.c LinuxBIOSv2/src/boot/hardwaremain.c
--- LinuxBIOSv2.orig1/src/boot/hardwaremain.c	2006-10-24 22:16:55.000000000 +0000
+++ LinuxBIOSv2/src/boot/hardwaremain.c	2006-10-24 22:36:09.000000000 +0000
@@ -88,7 +88,7 @@
 	 */
 	lb_mem = write_tables();
 
-#if CONFIG_FS_STREAM == 1
+#if CONFIG_FS_PAYLOAD == 1
 	filo(lb_mem);
 #else
 	elfboot(lb_mem);
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/config/Options.lb LinuxBIOSv2/src/config/Options.lb
--- LinuxBIOSv2.orig1/src/config/Options.lb	2006-10-24 22:19:52.000000000 +0000
+++ LinuxBIOSv2/src/config/Options.lb	2006-10-24 22:36:09.000000000 +0000
@@ -593,17 +593,17 @@
 # Boot options
 ###############################################
 
-define CONFIG_IDE_STREAM
+define CONFIG_IDE_PAYLOAD
 	default 0
 	export always
 	comment "Boot from IDE device"
 end
-define CONFIG_ROM_STREAM
+define CONFIG_ROM_PAYLOAD
 	default 0
 	export always
 	comment "Boot image is located in ROM" 
 end
-define CONFIG_ROM_STREAM_START
+define CONFIG_ROM_PAYLOAD_START
 	default {0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1}
 	format "0x%x"
 	export always
@@ -624,12 +624,12 @@
 	export always
 	comment "Boot image is already compressed prior to build"
 end
-define CONFIG_SERIAL_STREAM
+define CONFIG_SERIAL_PAYLOAD
 	default 0
 	export always
 	comment "Download boot image from serial port"
 end
-define CONFIG_FS_STREAM
+define CONFIG_FS_PAYLOAD
 	default 0
 	export always
 	comment "Boot from a filesystem"
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/advantech/som_gx533c/Config.lb LinuxBIOSv2/src/mainboard/advantech/som_gx533c/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/advantech/som_gx533c/Config.lb	2006-10-24 22:16:50.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/advantech/som_gx533c/Config.lb	2006-10-24 22:36:09.000000000 +0000
@@ -14,13 +14,13 @@
 ## Compute the start location and size size of
 ## The linuxBIOS bootloader.
 ##
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
 
 ##
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/advantech/som_gx533c/Options.lb LinuxBIOSv2/src/mainboard/advantech/som_gx533c/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/advantech/som_gx533c/Options.lb	2006-10-24 22:16:50.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/advantech/som_gx533c/Options.lb	2006-10-24 22:36:09.000000000 +0000
@@ -5,7 +5,7 @@
 uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -20,7 +20,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
@@ -105,7 +105,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/agami/aruma/Config.lb LinuxBIOSv2/src/mainboard/agami/aruma/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/agami/aruma/Config.lb	2006-10-24 22:16:55.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/agami/aruma/Config.lb	2006-10-24 22:36:09.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/agami/aruma/Options.lb LinuxBIOSv2/src/mainboard/agami/aruma/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/agami/aruma/Options.lb	2006-10-24 22:16:55.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/agami/aruma/Options.lb	2006-10-24 22:36:09.000000000 +0000
@@ -18,8 +18,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -184,7 +184,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/amd/quartet/Config.lb LinuxBIOSv2/src/mainboard/amd/quartet/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/amd/quartet/Config.lb	2006-10-24 22:16:50.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/amd/quartet/Config.lb	2006-10-24 22:36:09.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/amd/quartet/Options.lb LinuxBIOSv2/src/mainboard/amd/quartet/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/amd/quartet/Options.lb	2006-10-24 22:16:50.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/amd/quartet/Options.lb	2006-10-24 22:36:09.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -144,7 +144,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/amd/rumba/Config.lb LinuxBIOSv2/src/mainboard/amd/rumba/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/amd/rumba/Config.lb	2006-10-24 22:16:51.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/amd/rumba/Config.lb	2006-10-24 22:36:09.000000000 +0000
@@ -14,13 +14,13 @@
 ## Compute the start location and size size of
 ## The linuxBIOS bootloader.
 ##
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
 
 ##
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/amd/rumba/Options.lb LinuxBIOSv2/src/mainboard/amd/rumba/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/amd/rumba/Options.lb	2006-10-24 22:19:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/amd/rumba/Options.lb	2006-10-24 22:36:09.000000000 +0000
@@ -5,7 +5,7 @@
 uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -20,7 +20,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
 uses PAYLOAD_SIZE
 uses _ROMBASE
@@ -106,7 +106,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/amd/serenade/Config.lb LinuxBIOSv2/src/mainboard/amd/serenade/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/amd/serenade/Config.lb	2006-10-24 22:16:51.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/amd/serenade/Config.lb	2006-10-24 22:36:09.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/amd/serenade/Options.lb LinuxBIOSv2/src/mainboard/amd/serenade/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/amd/serenade/Options.lb	2006-10-24 22:16:51.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/amd/serenade/Options.lb	2006-10-24 22:36:09.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -143,7 +143,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/amd/serengeti_cheetah/Config.lb LinuxBIOSv2/src/mainboard/amd/serengeti_cheetah/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/amd/serengeti_cheetah/Config.lb	2006-10-24 22:16:51.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/amd/serengeti_cheetah/Config.lb	2006-10-24 22:36:09.000000000 +0000
@@ -20,12 +20,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/amd/serengeti_cheetah/Options.lb LinuxBIOSv2/src/mainboard/amd/serengeti_cheetah/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/amd/serengeti_cheetah/Options.lb	2006-10-24 22:19:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/amd/serengeti_cheetah/Options.lb	2006-10-24 22:36:09.000000000 +0000
@@ -21,8 +21,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
 uses PAYLOAD_SIZE
 uses _ROMBASE
@@ -265,7 +265,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 #default CONFIG_COMPRESSED_PAYLOAD_NRV2B = 1
 
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/amd/serengeti_leopard/Config.lb LinuxBIOSv2/src/mainboard/amd/serengeti_leopard/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/amd/serengeti_leopard/Config.lb	2006-10-24 22:16:51.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/amd/serengeti_leopard/Config.lb	2006-10-24 22:36:09.000000000 +0000
@@ -20,12 +20,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/amd/serengeti_leopard/Options.lb LinuxBIOSv2/src/mainboard/amd/serengeti_leopard/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/amd/serengeti_leopard/Options.lb	2006-10-24 22:16:51.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/amd/serengeti_leopard/Options.lb	2006-10-24 22:36:09.000000000 +0000
@@ -21,8 +21,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -244,7 +244,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/amd/solo/Config.lb LinuxBIOSv2/src/mainboard/amd/solo/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/amd/solo/Config.lb	2006-10-24 22:16:51.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/amd/solo/Config.lb	2006-10-24 22:36:09.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/amd/solo/Options.lb LinuxBIOSv2/src/mainboard/amd/solo/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/amd/solo/Options.lb	2006-10-24 22:16:51.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/amd/solo/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -16,8 +16,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -145,7 +145,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/arima/hdama/Config.lb LinuxBIOSv2/src/mainboard/arima/hdama/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/arima/hdama/Config.lb	2006-10-24 22:16:49.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/arima/hdama/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/arima/hdama/Options.lb LinuxBIOSv2/src/mainboard/arima/hdama/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/arima/hdama/Options.lb	2006-10-24 22:16:49.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/arima/hdama/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -162,7 +162,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/artecgroup/dbe61/Config.lb LinuxBIOSv2/src/mainboard/artecgroup/dbe61/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/artecgroup/dbe61/Config.lb	2006-10-24 22:16:53.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/artecgroup/dbe61/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -14,13 +14,13 @@
 ## Compute the start location and size size of
 ## The linuxBIOS bootloader.
 ##
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
 
 ##
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/artecgroup/dbe61/Options.lb LinuxBIOSv2/src/mainboard/artecgroup/dbe61/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/artecgroup/dbe61/Options.lb	2006-10-24 22:19:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/artecgroup/dbe61/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -5,7 +5,7 @@
 uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -20,7 +20,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
 uses PAYLOAD_SIZE
 uses _ROMBASE
@@ -113,7 +113,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/asus/p2b/Config.lb LinuxBIOSv2/src/mainboard/asus/p2b/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/asus/p2b/Config.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/asus/p2b/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -14,13 +14,13 @@
 ## Compute the start location and size size of
 ## The linuxBIOS bootloader.
 ##
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
 
 ##
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/asus/p2b/Options.lb LinuxBIOSv2/src/mainboard/asus/p2b/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/asus/p2b/Options.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/asus/p2b/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -5,7 +5,7 @@
 uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -20,7 +20,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
@@ -99,7 +99,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/bitworks/ims/Config.lb LinuxBIOSv2/src/mainboard/bitworks/ims/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/bitworks/ims/Config.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/bitworks/ims/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -14,13 +14,13 @@
 ## Compute the start location and size size of
 ## The linuxBIOS bootloader.
 ##
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
 
 ##
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/bitworks/ims/Options.lb LinuxBIOSv2/src/mainboard/bitworks/ims/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/bitworks/ims/Options.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/bitworks/ims/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -5,7 +5,7 @@
 uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -20,7 +20,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
@@ -99,7 +99,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/broadcom/blast/Config.lb LinuxBIOSv2/src/mainboard/broadcom/blast/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/broadcom/blast/Config.lb	2006-10-24 22:16:47.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/broadcom/blast/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/broadcom/blast/Options.lb LinuxBIOSv2/src/mainboard/broadcom/blast/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/broadcom/blast/Options.lb	2006-10-24 22:16:47.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/broadcom/blast/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -17,8 +17,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -195,7 +195,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/dell/s1850/Config.lb LinuxBIOSv2/src/mainboard/dell/s1850/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/dell/s1850/Config.lb	2006-10-24 22:16:46.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/dell/s1850/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -20,12 +20,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/dell/s1850/Options.lb LinuxBIOSv2/src/mainboard/dell/s1850/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/dell/s1850/Options.lb	2006-10-24 22:16:46.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/dell/s1850/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -154,7 +154,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM=1
+default CONFIG_ROM_PAYLOAD=1
 
 
 ###
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/densitron/dpx114/Config.lb LinuxBIOSv2/src/mainboard/densitron/dpx114/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/densitron/dpx114/Config.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/densitron/dpx114/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/densitron/dpx114/Options.lb LinuxBIOSv2/src/mainboard/densitron/dpx114/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/densitron/dpx114/Options.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/densitron/dpx114/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -5,7 +5,7 @@
 uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -20,7 +20,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
@@ -97,7 +97,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/digitallogic/adl855pc/Config.lb LinuxBIOSv2/src/mainboard/digitallogic/adl855pc/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/digitallogic/adl855pc/Config.lb	2006-10-24 22:16:49.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/digitallogic/adl855pc/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/digitallogic/adl855pc/Options.lb LinuxBIOSv2/src/mainboard/digitallogic/adl855pc/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/digitallogic/adl855pc/Options.lb	2006-10-24 22:16:49.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/digitallogic/adl855pc/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -5,7 +5,7 @@
 uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses CONFIG_UDELAY_IO
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
@@ -21,7 +21,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
@@ -102,7 +102,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/digitallogic/msm586seg/Config.lb LinuxBIOSv2/src/mainboard/digitallogic/msm586seg/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/digitallogic/msm586seg/Config.lb	2006-10-24 22:16:49.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/digitallogic/msm586seg/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -17,12 +17,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/digitallogic/msm586seg/Options.lb LinuxBIOSv2/src/mainboard/digitallogic/msm586seg/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/digitallogic/msm586seg/Options.lb	2006-10-24 22:16:49.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/digitallogic/msm586seg/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -6,7 +6,7 @@
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
 uses CONFIG_COMPRESS
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses CONFIG_USE_INIT
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
@@ -22,7 +22,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
@@ -110,7 +110,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/digitallogic/msm800sev/Config.lb LinuxBIOSv2/src/mainboard/digitallogic/msm800sev/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/digitallogic/msm800sev/Config.lb	2006-10-24 22:16:49.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/digitallogic/msm800sev/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -14,13 +14,13 @@
 ## Compute the start location and size size of
 ## The linuxBIOS bootloader.
 ##
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
 
 ##
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/digitallogic/msm800sev/Options.lb LinuxBIOSv2/src/mainboard/digitallogic/msm800sev/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/digitallogic/msm800sev/Options.lb	2006-10-24 22:19:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/digitallogic/msm800sev/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -5,7 +5,7 @@
 uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -20,7 +20,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
 uses PAYLOAD_SIZE
 uses _ROMBASE
@@ -114,7 +114,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/eaglelion/5bcm/Config.lb LinuxBIOSv2/src/mainboard/eaglelion/5bcm/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/eaglelion/5bcm/Config.lb	2006-10-24 22:16:50.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/eaglelion/5bcm/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -14,13 +14,13 @@
 ## Compute the start location and size size of
 ## The linuxBIOS bootloader.
 ##
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
 
 ##
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/eaglelion/5bcm/Options.lb LinuxBIOSv2/src/mainboard/eaglelion/5bcm/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/eaglelion/5bcm/Options.lb	2006-10-24 22:16:50.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/eaglelion/5bcm/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -5,7 +5,7 @@
 uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -20,7 +20,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
@@ -105,7 +105,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/embeddedplanet/ep405pc/Options.lb LinuxBIOSv2/src/mainboard/embeddedplanet/ep405pc/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/embeddedplanet/ep405pc/Options.lb	2006-10-24 22:16:50.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/embeddedplanet/ep405pc/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -20,7 +20,7 @@
 uses TTYS0_BAUD TTYS0_DIV
 uses NO_POST
 uses CONFIG_IDE
-uses CONFIG_FS_STREAM
+uses CONFIG_FS_PAYLOAD
 uses CONFIG_FS_EXT2
 uses CONFIG_FS_ISO9660
 uses CONFIG_FS_FAT
@@ -93,7 +93,7 @@
 
 ## Boot linux from IDE
 default CONFIG_IDE=1
-default CONFIG_FS_STREAM=1
+default CONFIG_FS_PAYLOAD=1
 default CONFIG_FS_EXT2=1
 default CONFIG_FS_ISO9660=1
 default CONFIG_FS_FAT=1
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/emulation/qemu-i386/Config.lb LinuxBIOSv2/src/mainboard/emulation/qemu-i386/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/emulation/qemu-i386/Config.lb	2006-10-24 22:16:50.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/emulation/qemu-i386/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -11,12 +11,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/emulation/qemu-i386/Options.lb LinuxBIOSv2/src/mainboard/emulation/qemu-i386/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/emulation/qemu-i386/Options.lb	2006-10-24 22:19:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/emulation/qemu-i386/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -9,7 +9,7 @@
 uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
 uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses CONFIG_PRECOMPRESSED_PAYLOAD
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -24,7 +24,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
@@ -105,7 +105,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/ibm/e325/Config.lb LinuxBIOSv2/src/mainboard/ibm/e325/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/ibm/e325/Config.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/ibm/e325/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/ibm/e325/Options.lb LinuxBIOSv2/src/mainboard/ibm/e325/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/ibm/e325/Options.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/ibm/e325/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -146,7 +146,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/ibm/e326/Config.lb LinuxBIOSv2/src/mainboard/ibm/e326/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/ibm/e326/Config.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/ibm/e326/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/ibm/e326/Options.lb LinuxBIOSv2/src/mainboard/ibm/e326/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/ibm/e326/Options.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/ibm/e326/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -152,7 +152,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/intel/jarrell/Config.lb LinuxBIOSv2/src/mainboard/intel/jarrell/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/intel/jarrell/Config.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/intel/jarrell/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -20,12 +20,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/intel/jarrell/Options.lb LinuxBIOSv2/src/mainboard/intel/jarrell/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/intel/jarrell/Options.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/intel/jarrell/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -168,7 +168,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM=1
+default CONFIG_ROM_PAYLOAD=1
 
 
 ###
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/intel/xe7501devkit/Config.lb LinuxBIOSv2/src/mainboard/intel/xe7501devkit/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/intel/xe7501devkit/Config.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/intel/xe7501devkit/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -21,7 +21,7 @@
 ##
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/intel/xe7501devkit/Options.lb LinuxBIOSv2/src/mainboard/intel/xe7501devkit/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/intel/xe7501devkit/Options.lb	2006-10-24 22:16:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/intel/xe7501devkit/Options.lb	2006-10-24 22:36:10.000000000 +0000
@@ -9,7 +9,7 @@
 uses CONFIG_MAX_PHYSICAL_CPUS
 uses CONFIG_IOAPIC
 uses CONFIG_SMP
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses STACK_SIZE
 uses HEAP_SIZE
 uses USE_OPTION_TABLE
@@ -45,7 +45,7 @@
 uses CONFIG_IDE
 
 ## The default definitions are used for these
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 
 ## These are defined in target Config.lb, don't add here
@@ -167,7 +167,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/iwill/dk8_htx/Config.lb LinuxBIOSv2/src/mainboard/iwill/dk8_htx/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/iwill/dk8_htx/Config.lb	2006-10-24 22:16:47.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/iwill/dk8_htx/Config.lb	2006-10-24 22:36:10.000000000 +0000
@@ -20,12 +20,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/iwill/dk8_htx/Options.lb LinuxBIOSv2/src/mainboard/iwill/dk8_htx/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/iwill/dk8_htx/Options.lb	2006-10-24 22:22:39.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/iwill/dk8_htx/Options.lb	2006-10-24 22:36:43.000000000 +0000
@@ -21,8 +21,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
 uses PAYLOAD_SIZE
 uses _ROMBASE
@@ -264,7 +264,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 #default CONFIG_COMPRESSED_PAYLOAD_NRV2B = 1
 
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/iwill/dk8s2/Config.lb LinuxBIOSv2/src/mainboard/iwill/dk8s2/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/iwill/dk8s2/Config.lb	2006-10-24 22:16:47.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/iwill/dk8s2/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/iwill/dk8s2/Options.lb LinuxBIOSv2/src/mainboard/iwill/dk8s2/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/iwill/dk8s2/Options.lb	2006-10-24 22:16:47.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/iwill/dk8s2/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -148,7 +148,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/iwill/dk8x/Config.lb LinuxBIOSv2/src/mainboard/iwill/dk8x/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/iwill/dk8x/Config.lb	2006-10-24 22:16:47.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/iwill/dk8x/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/iwill/dk8x/Options.lb LinuxBIOSv2/src/mainboard/iwill/dk8x/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/iwill/dk8x/Options.lb	2006-10-24 22:16:47.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/iwill/dk8x/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -147,7 +147,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/lippert/frontrunner/Config.lb LinuxBIOSv2/src/mainboard/lippert/frontrunner/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/lippert/frontrunner/Config.lb	2006-10-24 22:16:46.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/lippert/frontrunner/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -14,13 +14,13 @@
 ## Compute the start location and size size of
 ## The linuxBIOS bootloader.
 ##
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
 
 ##
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/lippert/frontrunner/Options.lb LinuxBIOSv2/src/mainboard/lippert/frontrunner/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/lippert/frontrunner/Options.lb	2006-10-24 22:16:46.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/lippert/frontrunner/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -5,7 +5,7 @@
 uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -20,7 +20,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
@@ -105,7 +105,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/motorola/sandpoint/Options.lb LinuxBIOSv2/src/mainboard/motorola/sandpoint/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/motorola/sandpoint/Options.lb	2006-10-24 22:16:49.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/motorola/sandpoint/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -22,7 +22,7 @@
 uses CONFIG_CONSOLE_SERIAL8250 
 uses TTYS0_BASE 
 uses CONFIG_IDE
-uses CONFIG_FS_STREAM 
+uses CONFIG_FS_PAYLOAD 
 uses CONFIG_FS_EXT2
 uses CONFIG_FS_ISO9660
 uses CONFIG_FS_FAT
@@ -83,7 +83,7 @@
 
 ## Load payload using filo
 default CONFIG_IDE=1
-default CONFIG_FS_STREAM=1
+default CONFIG_FS_PAYLOAD=1
 default CONFIG_FS_EXT2=1
 default CONFIG_FS_ISO9660=1
 default CONFIG_FS_FAT=1
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb LinuxBIOSv2/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb	2006-10-24 22:16:49.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -17,7 +17,7 @@
 uses CONFIG_CONSOLE_SERIAL8250 
 uses TTYS0_BASE 
 uses CONFIG_IDE
-uses CONFIG_FS_STREAM 
+uses CONFIG_FS_PAYLOAD 
 uses CONFIG_FS_EXT2
 uses CONFIG_FS_ISO9660
 uses CONFIG_FS_FAT
@@ -78,7 +78,7 @@
 
 ## Load payload using filo
 default CONFIG_IDE=1
-default CONFIG_FS_STREAM=1
+default CONFIG_FS_PAYLOAD=1
 default CONFIG_FS_EXT2=1
 default CONFIG_FS_ISO9660=1
 default CONFIG_FS_FAT=1
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/newisys/khepri/Config.lb LinuxBIOSv2/src/mainboard/newisys/khepri/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/newisys/khepri/Config.lb	2006-10-24 22:16:51.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/newisys/khepri/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/newisys/khepri/Options.lb LinuxBIOSv2/src/mainboard/newisys/khepri/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/newisys/khepri/Options.lb	2006-10-24 22:16:51.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/newisys/khepri/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -143,7 +143,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/olpc/btest/Config.lb LinuxBIOSv2/src/mainboard/olpc/btest/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/olpc/btest/Config.lb	2006-10-24 22:16:50.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/olpc/btest/Config.lb	2006-10-24 22:38:57.000000000 +0000
@@ -14,13 +14,13 @@
 ## Compute the start location and size size of
 ## The linuxBIOS bootloader.
 ##
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
 
 ##
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/olpc/btest/Options.lb LinuxBIOSv2/src/mainboard/olpc/btest/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/olpc/btest/Options.lb	2006-10-24 22:21:56.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/olpc/btest/Options.lb	2006-10-24 22:39:06.000000000 +0000
@@ -5,7 +5,7 @@
 uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -20,7 +20,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
 uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses CONFIG_PRECOMPRESSED_PAYLOAD
@@ -108,7 +108,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/olpc/rev_a/Config.lb LinuxBIOSv2/src/mainboard/olpc/rev_a/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/olpc/rev_a/Config.lb	2006-10-24 22:16:50.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/olpc/rev_a/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -14,13 +14,13 @@
 ## Compute the start location and size size of
 ## The linuxBIOS bootloader.
 ##
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
 
 ##
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/olpc/rev_a/Options.lb LinuxBIOSv2/src/mainboard/olpc/rev_a/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/olpc/rev_a/Options.lb	2006-10-24 22:19:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/olpc/rev_a/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -5,7 +5,7 @@
 uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -20,7 +20,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
 uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses CONFIG_PRECOMPRESSED_PAYLOAD
@@ -108,7 +108,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/sunw/ultra40/Config.lb LinuxBIOSv2/src/mainboard/sunw/ultra40/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/sunw/ultra40/Config.lb	2006-10-24 22:16:49.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/sunw/ultra40/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,13 +15,13 @@
 ## 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_STREAM     = 1
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD     = 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/sunw/ultra40/Options.lb LinuxBIOSv2/src/mainboard/sunw/ultra40/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/sunw/ultra40/Options.lb	2006-10-24 22:16:49.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/sunw/ultra40/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -16,8 +16,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -212,7 +212,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dai_g/Config.lb LinuxBIOSv2/src/mainboard/supermicro/x6dai_g/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dai_g/Config.lb	2006-10-24 22:16:47.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/supermicro/x6dai_g/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -20,12 +20,12 @@
 ## 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 be cached to speed up linuxBIOS,
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dai_g/Options.lb LinuxBIOSv2/src/mainboard/supermicro/x6dai_g/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dai_g/Options.lb	2006-10-24 22:16:47.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/supermicro/x6dai_g/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -154,7 +154,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM=1
+default CONFIG_ROM_PAYLOAD=1
 
 
 ###
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhe_g/Config.lb LinuxBIOSv2/src/mainboard/supermicro/x6dhe_g/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhe_g/Config.lb	2006-10-24 22:16:48.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/supermicro/x6dhe_g/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -20,12 +20,12 @@
 ## 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 be cached to speed up linuxBIOS.
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhe_g/Options.lb LinuxBIOSv2/src/mainboard/supermicro/x6dhe_g/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhe_g/Options.lb	2006-10-24 22:16:48.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/supermicro/x6dhe_g/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -154,7 +154,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM=1
+default CONFIG_ROM_PAYLOAD=1
 
 
 ###
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhe_g2/Config.lb LinuxBIOSv2/src/mainboard/supermicro/x6dhe_g2/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhe_g2/Config.lb	2006-10-24 22:16:48.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/supermicro/x6dhe_g2/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -20,12 +20,12 @@
 ## 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 be cached to speed up linuxBIOS.
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhe_g2/Options.lb LinuxBIOSv2/src/mainboard/supermicro/x6dhe_g2/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhe_g2/Options.lb	2006-10-24 22:16:48.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/supermicro/x6dhe_g2/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -154,7 +154,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM=1
+default CONFIG_ROM_PAYLOAD=1
 
 
 ###
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhr_ig/Config.lb LinuxBIOSv2/src/mainboard/supermicro/x6dhr_ig/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhr_ig/Config.lb	2006-10-24 22:16:48.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/supermicro/x6dhr_ig/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -20,12 +20,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhr_ig/Options.lb LinuxBIOSv2/src/mainboard/supermicro/x6dhr_ig/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhr_ig/Options.lb	2006-10-24 22:16:48.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/supermicro/x6dhr_ig/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -154,7 +154,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM=1
+default CONFIG_ROM_PAYLOAD=1
 
 
 ###
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhr_ig2/Config.lb LinuxBIOSv2/src/mainboard/supermicro/x6dhr_ig2/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhr_ig2/Config.lb	2006-10-24 22:16:48.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/supermicro/x6dhr_ig2/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -20,12 +20,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhr_ig2/Options.lb LinuxBIOSv2/src/mainboard/supermicro/x6dhr_ig2/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/supermicro/x6dhr_ig2/Options.lb	2006-10-24 22:16:48.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/supermicro/x6dhr_ig2/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,8 +15,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -154,7 +154,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM=1
+default CONFIG_ROM_PAYLOAD=1
 
 
 ###
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/technologic/ts5300/Config.lb LinuxBIOSv2/src/mainboard/technologic/ts5300/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/technologic/ts5300/Config.lb	2006-10-24 22:16:50.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/technologic/ts5300/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -17,12 +17,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/technologic/ts5300/Options.lb LinuxBIOSv2/src/mainboard/technologic/ts5300/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/technologic/ts5300/Options.lb	2006-10-24 22:19:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/technologic/ts5300/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -7,7 +7,7 @@
 uses USE_OPTION_TABLE
 uses CONFIG_COMPRESS
 uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses CONFIG_USE_INIT
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
@@ -23,7 +23,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
@@ -135,7 +135,7 @@
 default _RAMBASE = 0x00004000
 
 default CONFIG_COMPRESSED_PAYLOAD_NRV2B     = 1
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/totalimpact/briq/Options.lb LinuxBIOSv2/src/mainboard/totalimpact/briq/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/totalimpact/briq/Options.lb	2006-10-24 22:16:47.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/totalimpact/briq/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -18,7 +18,7 @@
 uses CONFIG_USE_INIT
 uses NO_POST
 uses CONFIG_CONSOLE_SERIAL8250 
-uses CONFIG_IDE_STREAM 
+uses CONFIG_IDE_PAYLOAD 
 uses IDE_BOOT_DRIVE
 uses IDE_SWAB IDE_OFFSET 
 uses ROM_SIZE
@@ -79,7 +79,7 @@
 default CONFIG_CONSOLE_SERIAL8250=1
 
 ## Boot linux from IDE
-default CONFIG_IDE_STREAM=1
+default CONFIG_IDE_PAYLOAD=1
 default IDE_BOOT_DRIVE=0
 default IDE_SWAB=1
 default IDE_OFFSET=0
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2735/Config.lb LinuxBIOSv2/src/mainboard/tyan/s2735/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2735/Config.lb	2006-10-24 22:16:53.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2735/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,13 +15,13 @@
 ## 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_STREAM     = 1
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD     = 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2735/Options.lb LinuxBIOSv2/src/mainboard/tyan/s2735/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2735/Options.lb	2006-10-24 22:16:53.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2735/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -17,8 +17,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -189,7 +189,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2850/Config.lb LinuxBIOSv2/src/mainboard/tyan/s2850/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2850/Config.lb	2006-10-24 22:16:53.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2850/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2850/Options.lb LinuxBIOSv2/src/mainboard/tyan/s2850/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2850/Options.lb	2006-10-24 22:16:53.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2850/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -16,8 +16,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -180,7 +180,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2875/Config.lb LinuxBIOSv2/src/mainboard/tyan/s2875/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2875/Config.lb	2006-10-24 22:16:54.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2875/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2875/Options.lb LinuxBIOSv2/src/mainboard/tyan/s2875/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2875/Options.lb	2006-10-24 22:16:54.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2875/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -16,8 +16,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -181,7 +181,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2880/Config.lb LinuxBIOSv2/src/mainboard/tyan/s2880/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2880/Config.lb	2006-10-24 22:16:53.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2880/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2880/Options.lb LinuxBIOSv2/src/mainboard/tyan/s2880/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2880/Options.lb	2006-10-24 22:16:53.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2880/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -16,8 +16,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -180,7 +180,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2881/Config.lb LinuxBIOSv2/src/mainboard/tyan/s2881/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2881/Config.lb	2006-10-24 22:16:53.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2881/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2881/Options.lb LinuxBIOSv2/src/mainboard/tyan/s2881/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2881/Options.lb	2006-10-24 22:16:53.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2881/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -16,8 +16,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -197,7 +197,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2882/Config.lb LinuxBIOSv2/src/mainboard/tyan/s2882/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2882/Config.lb	2006-10-24 22:16:53.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2882/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2882/Options.lb LinuxBIOSv2/src/mainboard/tyan/s2882/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2882/Options.lb	2006-10-24 22:16:54.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2882/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -16,8 +16,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -180,7 +180,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2885/Config.lb LinuxBIOSv2/src/mainboard/tyan/s2885/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2885/Config.lb	2006-10-24 22:16:55.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2885/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2885/Options.lb LinuxBIOSv2/src/mainboard/tyan/s2885/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2885/Options.lb	2006-10-24 22:16:55.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2885/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -16,8 +16,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -207,7 +207,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2891/Config.lb LinuxBIOSv2/src/mainboard/tyan/s2891/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2891/Config.lb	2006-10-24 22:16:54.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2891/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,13 +15,13 @@
 ## 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_STREAM     = 1
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD     = 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2891/Options.lb LinuxBIOSv2/src/mainboard/tyan/s2891/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2891/Options.lb	2006-10-24 22:16:54.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2891/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -16,8 +16,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -216,7 +216,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2892/Config.lb LinuxBIOSv2/src/mainboard/tyan/s2892/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2892/Config.lb	2006-10-24 22:16:54.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2892/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,13 +15,13 @@
 ## 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_STREAM     = 1
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD     = 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2892/Options.lb LinuxBIOSv2/src/mainboard/tyan/s2892/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2892/Options.lb	2006-10-24 22:16:54.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2892/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -16,8 +16,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -203,7 +203,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2895/Config.lb LinuxBIOSv2/src/mainboard/tyan/s2895/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2895/Config.lb	2006-10-24 22:16:55.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2895/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -20,12 +20,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s2895/Options.lb LinuxBIOSv2/src/mainboard/tyan/s2895/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s2895/Options.lb	2006-10-24 22:16:55.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s2895/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -19,8 +19,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -224,7 +224,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s4880/Config.lb LinuxBIOSv2/src/mainboard/tyan/s4880/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s4880/Config.lb	2006-10-24 22:16:54.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s4880/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,13 +15,13 @@
 ## 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_STREAM     = 1
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD     = 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s4880/Options.lb LinuxBIOSv2/src/mainboard/tyan/s4880/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s4880/Options.lb	2006-10-24 22:16:54.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s4880/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -16,8 +16,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -189,7 +189,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s4882/Config.lb LinuxBIOSv2/src/mainboard/tyan/s4882/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s4882/Config.lb	2006-10-24 22:16:54.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s4882/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,13 +15,13 @@
 ## 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_STREAM     = 1
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD     = 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/tyan/s4882/Options.lb LinuxBIOSv2/src/mainboard/tyan/s4882/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/tyan/s4882/Options.lb	2006-10-24 22:16:54.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/tyan/s4882/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -16,8 +16,8 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
@@ -188,7 +188,7 @@
 ##
 ## Load the payload from the ROM
 ##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
 
 ###
 ### Defaults of options that you may want to override in the target config file
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/via/epia/Config.lb LinuxBIOSv2/src/mainboard/via/epia/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/via/epia/Config.lb	2006-10-24 22:16:46.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/via/epia/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -14,13 +14,13 @@
 ## Compute the start location and size size of
 ## The linuxBIOS bootloader.
 ##
-default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 default PAYLOAD_SIZE            = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
 
 ##
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/via/epia/Options.lb LinuxBIOSv2/src/mainboard/via/epia/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/via/epia/Options.lb	2006-10-24 22:16:46.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/via/epia/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -13,7 +13,7 @@
 uses CONFIG_UDELAY_IO
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -28,7 +28,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses PAYLOAD_SIZE
 uses _ROMBASE
 uses _RAMBASE
@@ -125,7 +125,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/via/epia-m/Config.lb LinuxBIOSv2/src/mainboard/via/epia-m/Config.lb
--- LinuxBIOSv2.orig1/src/mainboard/via/epia-m/Config.lb	2006-10-24 22:16:46.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/via/epia-m/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -15,12 +15,12 @@
 ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/src/mainboard/via/epia-m/Options.lb LinuxBIOSv2/src/mainboard/via/epia-m/Options.lb
--- LinuxBIOSv2.orig1/src/mainboard/via/epia-m/Options.lb	2006-10-24 22:19:52.000000000 +0000
+++ LinuxBIOSv2/src/mainboard/via/epia-m/Options.lb	2006-10-24 22:36:11.000000000 +0000
@@ -5,7 +5,7 @@
 uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
 uses MAINBOARD_VENDOR
@@ -20,7 +20,7 @@
 uses ROM_IMAGE_SIZE
 uses ROM_SECTION_SIZE
 uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
 uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
 uses PAYLOAD_SIZE
 uses _ROMBASE
@@ -115,7 +115,7 @@
 
 default _RAMBASE = 0x00004000
 
-default CONFIG_ROM_STREAM     = 1
+default CONFIG_ROM_PAYLOAD     = 1
 
 ##
 ## The default compiler
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/stream/Config.lb LinuxBIOSv2/src/stream/Config.lb
--- LinuxBIOSv2.orig1/src/stream/Config.lb	2006-10-24 22:16:46.000000000 +0000
+++ LinuxBIOSv2/src/stream/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -1,23 +1,23 @@
-uses CONFIG_ROM_STREAM
-uses CONFIG_IDE_STREAM
-uses CONFIG_FS_STREAM
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_IDE_PAYLOAD
+uses CONFIG_FS_PAYLOAD
 uses CONFIG_IDE
-uses CONFIG_SERIAL_STREAM
+uses CONFIG_SERIAL_PAYLOAD
 
-if CONFIG_ROM_STREAM
+if CONFIG_ROM_PAYLOAD
   object rom_stream.o
 end
 
-if CONFIG_IDE_STREAM
+if CONFIG_IDE_PAYLOAD
   default CONFIG_IDE=1
   object ide_stream.o
 end
 
-if CONFIG_FS_STREAM
+if CONFIG_FS_PAYLOAD
   object fs_stream.o
   dir fs
 end
 
-if CONFIG_SERIAL_STREAM
+if CONFIG_SERIAL_PAYLOAD
   object serial_stream.o
 end
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/src/stream/rom_stream.c LinuxBIOSv2/src/stream/rom_stream.c
--- LinuxBIOSv2.orig1/src/stream/rom_stream.c	2006-10-24 22:19:52.000000000 +0000
+++ LinuxBIOSv2/src/stream/rom_stream.c	2006-10-24 22:36:11.000000000 +0000
@@ -30,21 +30,21 @@
 #include "../lib/lzma.c"
 #endif
 
-#ifndef CONFIG_ROM_STREAM_START
-#define CONFIG_ROM_STREAM_START 0xffff0000UL
+#ifndef CONFIG_ROM_PAYLOAD_START
+#define CONFIG_ROM_PAYLOAD_START 0xffff0000UL
 #endif
 
 /* well, this is a mess, and it will get fixed, but not right away.
  * until we stop using 'ld' for building the rom image, that is.
- * problem is, that on the sc520, ROM_STREAM_START has to be at 0x2000000.
- * but if you set CONFIG_ROM_STREAM_START to that, then ld will try to
+ * problem is, that on the sc520, ROM_PAYLOAD_START has to be at 0x2000000.
+ * but if you set CONFIG_ROM_PAYLOAD_START to that, then ld will try to
  * build a giant image: 0x0-0x2000000, i.e. almost 4 GB.
  * so make this non-static, non-const for now.
  */
 
 /*XXXXXXXXXXXXXX */
-/*static const */unsigned char *rom_start = (unsigned char *)CONFIG_ROM_STREAM_START;
-/*static const */unsigned char *rom_end   = (unsigned char *)(CONFIG_ROM_STREAM_START + PAYLOAD_SIZE - 1);
+/*static const */unsigned char *rom_start = (unsigned char *)CONFIG_ROM_PAYLOAD_START;
+/*static const */unsigned char *rom_end   = (unsigned char *)(CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE - 1);
 /*XXXXXXXXXXXXXX */
 
 static const unsigned char *rom;
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/targets/arima/hdama/Config.kernelimage.lb LinuxBIOSv2/targets/arima/hdama/Config.kernelimage.lb
--- LinuxBIOSv2.orig1/targets/arima/hdama/Config.kernelimage.lb	2006-10-24 22:17:02.000000000 +0000
+++ LinuxBIOSv2/targets/arima/hdama/Config.kernelimage.lb	2006-10-24 22:36:11.000000000 +0000
@@ -9,8 +9,8 @@
 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 HAVE_OPTION_TABLE=1
-option CONFIG_ROM_STREAM=1
+option CONFIG_ROM_PAYLOAD=1
 option HAVE_FALLBACK_BOOT=1
 
 ###
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/targets/embeddedplanet/ep405pc/Config.lb LinuxBIOSv2/targets/embeddedplanet/ep405pc/Config.lb
--- LinuxBIOSv2.orig1/targets/embeddedplanet/ep405pc/Config.lb	2006-10-24 22:17:02.000000000 +0000
+++ LinuxBIOSv2/targets/embeddedplanet/ep405pc/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -32,7 +32,7 @@
 
         ## 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/targets/iwill/dk8s2/Config.lb LinuxBIOSv2/targets/iwill/dk8s2/Config.lb
--- LinuxBIOSv2.orig1/targets/iwill/dk8s2/Config.lb	2006-10-24 22:17:02.000000000 +0000
+++ LinuxBIOSv2/targets/iwill/dk8s2/Config.lb	2006-10-24 22:38:38.000000000 +0000
@@ -119,7 +119,7 @@
 ### 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 @@
 	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 @@
 	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 -BurN --exclude '*~' LinuxBIOSv2.orig1/targets/motorola/sandpoint/Config.lb.ide_stream LinuxBIOSv2/targets/motorola/sandpoint/Config.lb.ide_stream
--- LinuxBIOSv2.orig1/targets/motorola/sandpoint/Config.lb.ide_stream	2006-10-24 22:17:02.000000000 +0000
+++ LinuxBIOSv2/targets/motorola/sandpoint/Config.lb.ide_stream	2006-10-24 22:36:11.000000000 +0000
@@ -16,7 +16,7 @@
 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 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/targets/newisys/khepri/Config.lb LinuxBIOSv2/targets/newisys/khepri/Config.lb
--- LinuxBIOSv2.orig1/targets/newisys/khepri/Config.lb	2006-10-24 22:17:03.000000000 +0000
+++ LinuxBIOSv2/targets/newisys/khepri/Config.lb	2006-10-24 22:36:11.000000000 +0000
@@ -20,7 +20,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
 
 option FALLBACK_SIZE=131072
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/targets/totalimpact/briq/Config.lb LinuxBIOSv2/targets/totalimpact/briq/Config.lb
--- LinuxBIOSv2.orig1/targets/totalimpact/briq/Config.lb	2006-10-24 22:17:02.000000000 +0000
+++ LinuxBIOSv2/targets/totalimpact/briq/Config.lb	2006-10-24 22:36:12.000000000 +0000
@@ -19,7 +19,7 @@
 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/targets/via/epia-m/Config.512kflash.lb LinuxBIOSv2/targets/via/epia-m/Config.512kflash.lb
--- LinuxBIOSv2.orig1/targets/via/epia-m/Config.512kflash.lb	2006-10-24 22:17:02.000000000 +0000
+++ LinuxBIOSv2/targets/via/epia-m/Config.512kflash.lb	2006-10-24 22:36:12.000000000 +0000
@@ -13,7 +13,7 @@
 
 
 option HAVE_OPTION_TABLE=1
-option CONFIG_ROM_STREAM=1
+option CONFIG_ROM_PAYLOAD=1
 option HAVE_FALLBACK_BOOT=1
 
 ###
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/targets/via/epia-m/Config-abuild.lb LinuxBIOSv2/targets/via/epia-m/Config-abuild.lb
--- LinuxBIOSv2.orig1/targets/via/epia-m/Config-abuild.lb	2006-10-24 22:17:02.000000000 +0000
+++ LinuxBIOSv2/targets/via/epia-m/Config-abuild.lb	2006-10-24 22:36:12.000000000 +0000
@@ -10,7 +10,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
 
 ###
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/targets/via/epia-m/Config.etherboot.lb LinuxBIOSv2/targets/via/epia-m/Config.etherboot.lb
--- LinuxBIOSv2.orig1/targets/via/epia-m/Config.etherboot.lb	2006-10-24 22:17:02.000000000 +0000
+++ LinuxBIOSv2/targets/via/epia-m/Config.etherboot.lb	2006-10-24 22:36:12.000000000 +0000
@@ -12,7 +12,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
 
 ###
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/targets/via/epia-m/Config.filo.lb LinuxBIOSv2/targets/via/epia-m/Config.filo.lb
--- LinuxBIOSv2.orig1/targets/via/epia-m/Config.filo.lb	2006-10-24 22:17:02.000000000 +0000
+++ LinuxBIOSv2/targets/via/epia-m/Config.filo.lb	2006-10-24 22:36:12.000000000 +0000
@@ -12,7 +12,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
 
 ###
diff -BurN --exclude '*~' LinuxBIOSv2.orig1/targets/via/epia-m/Config.lb LinuxBIOSv2/targets/via/epia-m/Config.lb
--- LinuxBIOSv2.orig1/targets/via/epia-m/Config.lb	2006-10-24 22:19:52.000000000 +0000
+++ LinuxBIOSv2/targets/via/epia-m/Config.lb	2006-10-24 22:36:12.000000000 +0000
@@ -11,7 +11,7 @@
 
 
 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 -BurN --exclude '*~' LinuxBIOSv2.orig1/targets/via/epia-m/Config.vga.filo LinuxBIOSv2/targets/via/epia-m/Config.vga.filo
--- LinuxBIOSv2.orig1/targets/via/epia-m/Config.vga.filo	2006-10-24 22:17:02.000000000 +0000
+++ LinuxBIOSv2/targets/via/epia-m/Config.vga.filo	2006-10-24 22:36:12.000000000 +0000
@@ -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
 
 ###
