diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2007-02-27 14:11:18 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2007-02-27 14:11:18 +0000 |
| commit | e6fdf9707519caf41db2a15a72a1ca98415c2d5c (patch) | |
| tree | 128cc656948f96bc24fefb8d73c535082382e49e /src/mainboard/tyan/s2912 | |
| parent | 72e87062f494d90bc61c0ea15c05539ce109df9a (diff) | |
This is another fixup round for Yinghai Lu's great patch.
It does the ROM_STREAM -> PAYLOAD rename that afaik was done after
Yinghai sent his work to legal, so it is required to get that code
building.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2561 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/tyan/s2912')
| -rw-r--r-- | src/mainboard/tyan/s2912/Config.lb | 4 | ||||
| -rw-r--r-- | src/mainboard/tyan/s2912/Options.lb | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/mainboard/tyan/s2912/Config.lb b/src/mainboard/tyan/s2912/Config.lb index 814e2d4f0b..12e98e7589 100644 --- a/src/mainboard/tyan/s2912/Config.lb +++ b/src/mainboard/tyan/s2912/Config.lb @@ -41,12 +41,12 @@ end ## The linuxBIOS bootloader. ## default PAYLOAD_SIZE = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE ) -default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1) +default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1) ## ## Compute where this copy of linuxBIOS will start in the boot rom ## -default _ROMBASE = ( CONFIG_ROM_STREAM_START + PAYLOAD_SIZE ) +default _ROMBASE = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE ) ## ## Compute a range of ROM that can cached to speed up linuxBIOS, diff --git a/src/mainboard/tyan/s2912/Options.lb b/src/mainboard/tyan/s2912/Options.lb index d661649d6f..577dd5369a 100644 --- a/src/mainboard/tyan/s2912/Options.lb +++ b/src/mainboard/tyan/s2912/Options.lb @@ -42,11 +42,11 @@ uses ROM_SECTION_SIZE uses ROM_IMAGE_SIZE uses ROM_SECTION_SIZE uses ROM_SECTION_OFFSET -uses CONFIG_ROM_STREAM -uses CONFIG_ROM_STREAM_START -uses CONFIG_COMPRESSED_ROM_STREAM -uses CONFIG_COMPRESSED_ROM_STREAM_LZMA -uses CONFIG_PRECOMPRESSED_ROM_STREAM +uses CONFIG_ROM_PAYLOAD +uses CONFIG_ROM_PAYLOAD_START +uses CONFIG_COMPRESSED_PAYLOAD_NRV2B +uses CONFIG_COMPRESSED_PAYLOAD_LZMA +uses CONFIG_PRECOMPRESSED_PAYLOAD uses PAYLOAD_SIZE uses _ROMBASE uses XIP_ROM_SIZE @@ -288,9 +288,9 @@ default _RAMBASE=0x00100000 ## ## Load the payload from the ROM ## -default CONFIG_ROM_STREAM = 1 +default CONFIG_ROM_PAYLOAD = 1 -#default CONFIG_COMPRESSED_ROM_STREAM = 1 +#default CONFIG_COMPRESSED_PAYLOAD = 1 ### ### Defaults of options that you may want to override in the target config file |