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/arch/i386 | |
| 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/arch/i386')
| -rw-r--r-- | src/arch/i386/lib/failover.lds | 2 | ||||
| -rw-r--r-- | src/arch/i386/lib/failover_failover.lds | 4 | ||||
| -rw-r--r-- | src/arch/i386/lib/id.inc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/i386/lib/failover.lds b/src/arch/i386/lib/failover.lds index 94c3e097fb..25f3200911 100644 --- a/src/arch/i386/lib/failover.lds +++ b/src/arch/i386/lib/failover.lds @@ -1 +1 @@ - __normal_image = (CONFIG_ROM_PAYLOAD_START & 0xfffffff0) - 8; + __normal_image = (CONFIG_ROMBASE & 0xfffffff0) - 8; diff --git a/src/arch/i386/lib/failover_failover.lds b/src/arch/i386/lib/failover_failover.lds index ec8c12a9e4..19e6edfaaa 100644 --- a/src/arch/i386/lib/failover_failover.lds +++ b/src/arch/i386/lib/failover_failover.lds @@ -1,2 +1,2 @@ - __fallback_image = (CONFIG_ROM_PAYLOAD_START & 0xfffffff0) - 8; - __normal_image = ((CONFIG_ROM_PAYLOAD_START - CONFIG_FALLBACK_SIZE) & 0xfffffff0) - 8; + __fallback_image = (CONFIG_ROMBASE & 0xfffffff0) - 8; + __normal_image = ((CONFIG_ROMBASE - CONFIG_FALLBACK_SIZE) & 0xfffffff0) - 8; diff --git a/src/arch/i386/lib/id.inc b/src/arch/i386/lib/id.inc index c2f634ea00..181ab63d28 100644 --- a/src/arch/i386/lib/id.inc +++ b/src/arch/i386/lib/id.inc @@ -8,7 +8,7 @@ part: .asciz CONFIG_MAINBOARD_PART_NUMBER .long __id_end + 0x10 - vendor /* Reverse offset to the vendor id */ .long __id_end + 0x10 - part /* Reverse offset to the part number */ -.long CONFIG_PAYLOAD_SIZE + CONFIG_ROM_IMAGE_SIZE /* Size of this romimage */ +.long CONFIG_ROM_SIZE /* Size of this romimage */ .globl __id_end __id_end: |