Author: stepan Date: 2007-02-27 15:11:18 +0100 (Tue, 27 Feb 2007) New Revision: 2561
Modified: trunk/LinuxBIOSv2/src/mainboard/gigabyte/m57sli/Config.lb trunk/LinuxBIOSv2/src/mainboard/gigabyte/m57sli/Options.lb trunk/LinuxBIOSv2/src/mainboard/nvidia/l1_2pvv/Config.lb trunk/LinuxBIOSv2/src/mainboard/nvidia/l1_2pvv/Options.lb trunk/LinuxBIOSv2/src/mainboard/supermicro/h8dmr/Config.lb trunk/LinuxBIOSv2/src/mainboard/supermicro/h8dmr/Options.lb trunk/LinuxBIOSv2/src/mainboard/tyan/s2912/Config.lb trunk/LinuxBIOSv2/src/mainboard/tyan/s2912/Options.lb trunk/LinuxBIOSv2/targets/gigabyte/m57sli/Config.lb.kernel trunk/LinuxBIOSv2/targets/nvidia/l1_2pvv/Config.lb.kernel trunk/LinuxBIOSv2/targets/supermicro/h8dmr/Config.lb.kernel trunk/LinuxBIOSv2/targets/tyan/s2912/Config.lb.kernel Log: 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
Modified: trunk/LinuxBIOSv2/src/mainboard/gigabyte/m57sli/Config.lb =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/gigabyte/m57sli/Config.lb 2007-02-26 13:52:42 UTC (rev 2560) +++ trunk/LinuxBIOSv2/src/mainboard/gigabyte/m57sli/Config.lb 2007-02-27 14:11:18 UTC (rev 2561) @@ -41,12 +41,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,
Modified: trunk/LinuxBIOSv2/src/mainboard/gigabyte/m57sli/Options.lb =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/gigabyte/m57sli/Options.lb 2007-02-26 13:52:42 UTC (rev 2560) +++ trunk/LinuxBIOSv2/src/mainboard/gigabyte/m57sli/Options.lb 2007-02-27 14:11:18 UTC (rev 2561) @@ -42,11 +42,11 @@ 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 @@ -286,9 +286,9 @@ ## ## 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_NRV2B = 1
### ### Defaults of options that you may want to override in the target config file
Modified: trunk/LinuxBIOSv2/src/mainboard/nvidia/l1_2pvv/Config.lb =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/nvidia/l1_2pvv/Config.lb 2007-02-26 13:52:42 UTC (rev 2560) +++ trunk/LinuxBIOSv2/src/mainboard/nvidia/l1_2pvv/Config.lb 2007-02-27 14:11:18 UTC (rev 2561) @@ -41,12 +41,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,
Modified: trunk/LinuxBIOSv2/src/mainboard/nvidia/l1_2pvv/Options.lb =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/nvidia/l1_2pvv/Options.lb 2007-02-26 13:52:42 UTC (rev 2560) +++ trunk/LinuxBIOSv2/src/mainboard/nvidia/l1_2pvv/Options.lb 2007-02-27 14:11:18 UTC (rev 2561) @@ -42,11 +42,11 @@ 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 @@ -286,9 +286,9 @@ ## ## 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
Modified: trunk/LinuxBIOSv2/src/mainboard/supermicro/h8dmr/Config.lb =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/supermicro/h8dmr/Config.lb 2007-02-26 13:52:42 UTC (rev 2560) +++ trunk/LinuxBIOSv2/src/mainboard/supermicro/h8dmr/Config.lb 2007-02-27 14:11:18 UTC (rev 2561) @@ -41,12 +41,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,
Modified: trunk/LinuxBIOSv2/src/mainboard/supermicro/h8dmr/Options.lb =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/supermicro/h8dmr/Options.lb 2007-02-26 13:52:42 UTC (rev 2560) +++ trunk/LinuxBIOSv2/src/mainboard/supermicro/h8dmr/Options.lb 2007-02-27 14:11:18 UTC (rev 2561) @@ -42,11 +42,11 @@ 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 @@ -283,9 +283,9 @@ ## ## 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
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2912/Config.lb =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s2912/Config.lb 2007-02-26 13:52:42 UTC (rev 2560) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2912/Config.lb 2007-02-27 14:11:18 UTC (rev 2561) @@ -41,12 +41,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,
Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2912/Options.lb =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/tyan/s2912/Options.lb 2007-02-26 13:52:42 UTC (rev 2560) +++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2912/Options.lb 2007-02-27 14:11:18 UTC (rev 2561) @@ -42,11 +42,11 @@ 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 @@ ## ## 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
Modified: trunk/LinuxBIOSv2/targets/gigabyte/m57sli/Config.lb.kernel =================================================================== --- trunk/LinuxBIOSv2/targets/gigabyte/m57sli/Config.lb.kernel 2007-02-26 13:52:42 UTC (rev 2560) +++ trunk/LinuxBIOSv2/targets/gigabyte/m57sli/Config.lb.kernel 2007-02-27 14:11:18 UTC (rev 2561) @@ -30,8 +30,8 @@ romimage "fallback" option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=1 - option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1 - option CONFIG_PRECOMPRESSED_ROM_STREAM=1 + option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 + option CONFIG_PRECOMPRESSED_PAYLOAD=1 # option ROM_IMAGE_SIZE=0x19800 option ROM_IMAGE_SIZE=0x17000 # option ROM_IMAGE_SIZE=0x15800
Modified: trunk/LinuxBIOSv2/targets/nvidia/l1_2pvv/Config.lb.kernel =================================================================== --- trunk/LinuxBIOSv2/targets/nvidia/l1_2pvv/Config.lb.kernel 2007-02-26 13:52:42 UTC (rev 2560) +++ trunk/LinuxBIOSv2/targets/nvidia/l1_2pvv/Config.lb.kernel 2007-02-27 14:11:18 UTC (rev 2561) @@ -32,8 +32,8 @@ romimage "fallback" option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=1 - option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1 - option CONFIG_PRECOMPRESSED_ROM_STREAM=1 + option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 + option CONFIG_PRECOMPRESSED_PAYLOAD=1 # option ROM_IMAGE_SIZE=0x19800 option ROM_IMAGE_SIZE=0x17000 # option ROM_IMAGE_SIZE=0x15800
Modified: trunk/LinuxBIOSv2/targets/supermicro/h8dmr/Config.lb.kernel =================================================================== --- trunk/LinuxBIOSv2/targets/supermicro/h8dmr/Config.lb.kernel 2007-02-26 13:52:42 UTC (rev 2560) +++ trunk/LinuxBIOSv2/targets/supermicro/h8dmr/Config.lb.kernel 2007-02-27 14:11:18 UTC (rev 2561) @@ -28,8 +28,8 @@ romimage "fallback" option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=1 - option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1 - option CONFIG_PRECOMPRESSED_ROM_STREAM=1 + option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 + option CONFIG_PRECOMPRESSED_PAYLOAD=1 # option ROM_IMAGE_SIZE=0x19800 option ROM_IMAGE_SIZE=0x18000 # option ROM_IMAGE_SIZE=0x15800
Modified: trunk/LinuxBIOSv2/targets/tyan/s2912/Config.lb.kernel =================================================================== --- trunk/LinuxBIOSv2/targets/tyan/s2912/Config.lb.kernel 2007-02-26 13:52:42 UTC (rev 2560) +++ trunk/LinuxBIOSv2/targets/tyan/s2912/Config.lb.kernel 2007-02-27 14:11:18 UTC (rev 2561) @@ -30,8 +30,8 @@ romimage "fallback" option USE_FAILOVER_IMAGE=0 option USE_FALLBACK_IMAGE=1 - option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1 - option CONFIG_PRECOMPRESSED_ROM_STREAM=1 + option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 + option CONFIG_PRECOMPRESSED_PAYLOAD=1 # option ROM_IMAGE_SIZE=0x19800 option ROM_IMAGE_SIZE=0x17000 # option ROM_IMAGE_SIZE=0x15800