diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-10-04 18:55:40 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-10-04 18:55:40 +0000 |
| commit | 24796fd364176ce8bb4f4eb727e0ba2ece188c08 (patch) | |
| tree | 08b54626dd61f7c0dddab795ff0025acd71eefe8 /src/config | |
| parent | 70b0cf23ce18371be96062476e4fdc88d4930683 (diff) | |
This does away with CONFIG_ROM_PAYLOAD_START and CONFIG_PAYLOAD_SIZE.
Both were only really used in pre-cbfs, as the payload's size isn't
relevant for the build process anymore.
Various calculations in {no,}failovercalculation.lb are adapted
accordingly.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4720 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/Options.lb | 14 | ||||
| -rw-r--r-- | src/config/failovercalculation.lb | 9 | ||||
| -rw-r--r-- | src/config/nofailovercalculation.lb | 9 |
3 files changed, 3 insertions, 29 deletions
diff --git a/src/config/Options.lb b/src/config/Options.lb index 071362a596..882219673c 100644 --- a/src/config/Options.lb +++ b/src/config/Options.lb @@ -246,14 +246,8 @@ define CONFIG_ROM_SECTION_OFFSET export used comment "Default rom section offset" end -define CONFIG_PAYLOAD_SIZE - default {CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE} - format "0x%x" - export always - comment "Default payload size" -end define CONFIG_ROMBASE - default {CONFIG_PAYLOAD_SIZE} + default {0xffffffff - CONFIG_ROM_SIZE + 1} format "0x%x" export always comment "Base address of coreboot in ROM" @@ -646,12 +640,6 @@ define CONFIG_ROM_PAYLOAD export always comment "Boot image is located in ROM" end -define CONFIG_ROM_PAYLOAD_START - default {0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1} - format "0x%x" - export always - comment "ROM stream start location" -end define CONFIG_COMPRESSED_PAYLOAD_NRV2B default 0 export always diff --git a/src/config/failovercalculation.lb b/src/config/failovercalculation.lb index e5ec7e19ce..1bd48bb13b 100644 --- a/src/config/failovercalculation.lb +++ b/src/config/failovercalculation.lb @@ -16,16 +16,9 @@ else end ## -## Compute the start location and size size of -## The coreboot bootloader. -## -default CONFIG_PAYLOAD_SIZE = ( CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE ) -default CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1) - -## ## Compute where this copy of coreboot will start in the boot rom ## -default CONFIG_ROMBASE = ( CONFIG_ROM_PAYLOAD_START + CONFIG_PAYLOAD_SIZE ) +default CONFIG_ROMBASE = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1) ## ## Compute a range of ROM that can cached to speed up coreboot, diff --git a/src/config/nofailovercalculation.lb b/src/config/nofailovercalculation.lb index f5f8708b65..6082c3e9a3 100644 --- a/src/config/nofailovercalculation.lb +++ b/src/config/nofailovercalculation.lb @@ -11,16 +11,9 @@ else end ## -## Compute the start location and size size of -## The coreboot bootloader. -## -default CONFIG_PAYLOAD_SIZE = ( CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE ) -default CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1) - -## ## Compute where this copy of coreboot will start in the boot rom ## -default CONFIG_ROMBASE = ( CONFIG_ROM_PAYLOAD_START + CONFIG_PAYLOAD_SIZE ) +default CONFIG_ROMBASE = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1) ## ## Compute a range of ROM that can cached to speed up coreboot, |