diff options
| -rw-r--r-- | src/arch/i386/init/ldscript_cbfs.lb | 59 | ||||
| -rw-r--r-- | src/arch/i386/init/ldscript_failover.lb | 19 | ||||
| -rw-r--r-- | src/arch/i386/init/ldscript_fallback_cbfs.lb | 3 |
3 files changed, 10 insertions, 71 deletions
diff --git a/src/arch/i386/init/ldscript_cbfs.lb b/src/arch/i386/init/ldscript_cbfs.lb deleted file mode 100644 index 37e867db21..0000000000 --- a/src/arch/i386/init/ldscript_cbfs.lb +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Memory map: - * - * CONFIG_RAMBASE - * : data segment - * : bss segment - * : heap - * : stack - * CONFIG_ROMBASE - * : coreboot text - * : readonly text - */ -/* - * Bootstrap code for the STPC Consumer - * Copyright (c) 1999 by Net Insight AB. All Rights Reserved. - * - */ - -/* - * Written by Johan Rydberg, based on work by Daniel Kahlin. - * Rewritten by Eric Biederman - */ -/* - * We use ELF as output format. So that we can - * debug the code in some form. - */ -OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") -OUTPUT_ARCH(i386) - -/* -ENTRY(_start) -*/ - -TARGET(binary) -SECTIONS -{ - . = CONFIG_ROMBASE; - - /* This section might be better named .setup */ - .rom . : { - _rom = .; - *(.rom.text); - *(.rom.data); - *(.rodata.*); - *(.rom.data.*); - . = ALIGN(16); - _erom = .; - } - - _lrom = LOADADDR(.rom); - _elrom = LOADADDR(.rom) + SIZEOF(.rom); - - /DISCARD/ : { - *(.comment) - *(.comment.*) - *(.note) - *(.note.*) - } -} diff --git a/src/arch/i386/init/ldscript_failover.lb b/src/arch/i386/init/ldscript_failover.lb index 099cae9d8a..deec710209 100644 --- a/src/arch/i386/init/ldscript_failover.lb +++ b/src/arch/i386/init/ldscript_failover.lb @@ -27,33 +27,34 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") OUTPUT_ARCH(i386) -/* -ENTRY(_start) -*/ +MEMORY { + rom : ORIGIN = 0xffff0000, LENGTH = 64K +} TARGET(binary) SECTIONS { - . = CONFIG_ROMBASE; + . = 0; /* This section might be better named .setup */ - .rom . : { + .rom ROMLOC : { _rom = .; *(.rom.text); *(.rom.data); *(.rom.data.*); *(.rodata.*); - . = ALIGN(16); _erom = .; - } + } >rom =0xff - _lrom = LOADADDR(.rom); - _elrom = LOADADDR(.rom) + SIZEOF(.rom); + ROMLOC = 0xffffff00 - (_erom - _rom) + 1; /DISCARD/ : { *(.comment) *(.note) *(.comment.*) *(.note.*) + *(.iplt) + *(.rel.*) + *(.igot.*) } } diff --git a/src/arch/i386/init/ldscript_fallback_cbfs.lb b/src/arch/i386/init/ldscript_fallback_cbfs.lb index eb3bf3f0d7..a8747f61aa 100644 --- a/src/arch/i386/init/ldscript_fallback_cbfs.lb +++ b/src/arch/i386/init/ldscript_fallback_cbfs.lb @@ -53,9 +53,6 @@ SECTIONS _erom = .; } - _lrom = LOADADDR(.rom); - _elrom = LOADADDR(.rom) + SIZEOF(.rom); - /DISCARD/ : { *(.comment) *(.note) |