diff options
| author | Ed Swierk <eswierk@arastra.com> | 2006-12-15 12:56:28 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2006-12-15 12:56:28 +0000 |
| commit | be13dc72d91bd3c5791fb2a3a18ee610860404ee (patch) | |
| tree | 97e8702383a84bfb0cd22f337d70885ebe7713dc /src/stream/rom_stream.c | |
| parent | 8bb1dc5c776699d2037923c6594e2e998c7bec09 (diff) | |
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
Diffstat (limited to 'src/stream/rom_stream.c')
| -rw-r--r-- | src/stream/rom_stream.c | 12 |
1 files changed, 6 insertions, 6 deletions
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; |