summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2009-12-01 09:35:19 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2009-12-01 09:35:19 +0000
commit0f6ee7b719dd5b8858a22b509009b7a47dff8c0c (patch)
treee746be8aada8da47f6ad7dabbffb495430d31c9b /src/arch
parent702a5a57417cd75f29a6ba8c2203170272d987ff (diff)
Not all boards cope with automatically sized bootblocks, leading to 4GB
images due to the "helpful" 4GB rollover behaviour of ld(1). Back out r4961, something like this should go in eventually, but more completely tested and working. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4971 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/i386/init/ldscript_fallback_cbfs.lb14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/arch/i386/init/ldscript_fallback_cbfs.lb b/src/arch/i386/init/ldscript_fallback_cbfs.lb
index 6dec5eda9a..eb3bf3f0d7 100644
--- a/src/arch/i386/init/ldscript_fallback_cbfs.lb
+++ b/src/arch/i386/init/ldscript_fallback_cbfs.lb
@@ -40,10 +40,8 @@ SECTIONS
_x = .;
. = (_x < (CONFIG_ROMBASE - 0x10000 + CONFIG_ROM_IMAGE_SIZE)) ? (CONFIG_ROMBASE - 0x10000 + CONFIG_ROM_IMAGE_SIZE) : _x;
- __my_rom_start = .;
-
/* This section might be better named .setup */
- .rom _myrom : {
+ .rom . : {
_rom = .;
*(.rom.text);
*(.rom.data);
@@ -56,7 +54,6 @@ SECTIONS
}
_lrom = LOADADDR(.rom);
-
_elrom = LOADADDR(.rom) + SIZEOF(.rom);
/DISCARD/ : {
@@ -65,13 +62,4 @@ SECTIONS
*(.comment.*)
*(.note.*)
}
-
- __my_rom_end = .;
-
- __my_rom_size = (( ( __my_rom_end - __my_rom_start ) / 256) + 2 ) * 256;
- /* Next line gives same output for me as above one but causes
- * ld to complain about non constant offset so
- __my_rom_size = (( (SIZEOF(.rom) + SIZEOF(.data) + SIZEOF(.text)) / 256 ) + 2 ) * 256;
- */
- _myrom = _rom + (0x10000 - __my_rom_size);
}