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
This commit is contained in:
parent
72e87062f4
commit
e6fdf97075
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
@ -286,9 +286,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_NRV2B = 1
|
||||
|
||||
###
|
||||
### Defaults of options that you may want to override in the target config file
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
@ -286,9 +286,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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
@ -283,9 +283,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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -30,8 +30,8 @@ option FALLBACK_SIZE=(ROM_SIZE-0x1000)
|
|||
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
|
||||
|
|
|
@ -32,8 +32,8 @@ option FALLBACK_SIZE=(ROM_SIZE-0x1000)
|
|||
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
|
||||
|
|
|
@ -28,8 +28,8 @@ option FALLBACK_SIZE=(ROM_SIZE-0x1000)
|
|||
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
|
||||
|
|
|
@ -30,8 +30,8 @@ option FALLBACK_SIZE=(ROM_SIZE-0x1000)
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue