Hi,
this patch 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.
abuild is happily chugging along, but it isn't runtime tested. esp. failover boards are affected by this, so if someone with a board configured for failover could test this, and report back (basically: do both fallback and normal still work?), I'd be grateful.
Various calculations in {no,}failovercalculation.lb are adapted accordingly.
Signed-off-by: Patrick Georgi patrick.georgi@coresystems.de
Patrick Georgi wrote:
this patch 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.
abuild is happily chugging along, but it isn't runtime tested. esp. failover boards are affected by this, so if someone with a board configured for failover could test this, and report back (basically: do both fallback and normal still work?), I'd be grateful.
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
Might be wise to wait for some testing, but I really like this!
uses CONFIG_ROM_IMAGE_SIZE uses CONFIG_ROM_SECTION_SIZE uses CONFIG_ROM_SECTION_OFFSET
What about these ones? They are also affected by cbfs, right?
+++ src/mainboard/intel/xe7501devkit/Options.lb (Arbeitskopie) @@ -47,8 +47,6 @@ uses CONFIG_IDE
## The default definitions are used for these -uses CONFIG_ROM_PAYLOAD_START -uses CONFIG_PAYLOAD_SIZE
## These are defined in target Config.lb, don't add here uses CONFIG_USE_FALLBACK_IMAGE
Please delete the comment and a blank line too.
Index: src/arch/i386/lib/failover_failover.lds
--- src/arch/i386/lib/failover_failover.lds (Revision 4716) +++ src/arch/i386/lib/failover_failover.lds (Arbeitskopie) @@ -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;
Index: src/arch/i386/lib/failover.lds
--- src/arch/i386/lib/failover.lds (Revision 4716) +++ src/arch/i386/lib/failover.lds (Arbeitskopie) @@ -1 +1 @@
- __normal_image = (CONFIG_ROM_PAYLOAD_START & 0xfffffff0) - 8;
- __normal_image = (CONFIG_ROMBASE & 0xfffffff0) - 8;
What do these files do, exactly? What is the -8 about?
//Peter
Am Sonntag, den 04.10.2009, 16:24 +0200 schrieb Peter Stuge:
Might be wise to wait for some testing, but I really like this!
I'll wait a bit more.
uses CONFIG_ROM_IMAGE_SIZE uses CONFIG_ROM_SECTION_SIZE uses CONFIG_ROM_SECTION_OFFSET
What about these ones? They are also affected by cbfs, right?
I'm not done yet :-)
Please delete the comment and a blank line too.
Right, thanks
--- src/arch/i386/lib/failover.lds (Revision 4716) +++ src/arch/i386/lib/failover.lds (Arbeitskopie) @@ -1 +1 @@
- __normal_image = (CONFIG_ROM_PAYLOAD_START & 0xfffffff0) - 8;
- __normal_image = (CONFIG_ROMBASE & 0xfffffff0) - 8;
What do these files do, exactly? What is the -8 about?
They define the symbols used in linking: failover does a jmp __normal_image to get to normal, this one calculates the address: 8 bytes before the start of the current image in this case, similar for the others. reset32.{inc,lds} creates a jump instruction there, jumping to the real start address.
Patrick