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

(Patch 2, refs #14)

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


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

2 files changed, 14 insertions, 14 deletions

diff --git a/src/stream/Config.lb b/src/stream/Config.lb
index 0385d63028..191b593b4c 100644
--- a/src/stream/Config.lb
+++ b/src/stream/Config.lb
@@ -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 --git a/src/stream/rom_stream.c b/src/stream/rom_stream.c
index 2000c5f576..9be265e8af 100644
--- a/src/stream/rom_stream.c
+++ b/src/stream/rom_stream.c
@@ -30,21 +30,21 @@ extern unsigned char _heap, _eheap;
 #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;