diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-03 08:21:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-03 08:21:05 -0400 |
| commit | 5d6fefa8051a29b26169983cbcf9378bb363f8b2 (patch) | |
| tree | 02698bdef9005f995c36d87353c3f172e082836c /arch/mips/cpu/u-boot.lds | |
| parent | 99431c1c21685fe63d46b6eac995b78ce9adce0a (diff) | |
| parent | 963014641117291c15df2425caf46c7b4b979f18 (diff) | |
Merge tag 'mips-fixes-for-v2018.11' of git://git.denx.de/u-boot-mips
- replace the dynamic size of the relocation table
with a fixed but configurable size
- fixes non-working CONFIG_OF_SEPARATE=y due to invalid _end symbol
Diffstat (limited to 'arch/mips/cpu/u-boot.lds')
| -rw-r--r-- | arch/mips/cpu/u-boot.lds | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/arch/mips/cpu/u-boot.lds b/arch/mips/cpu/u-boot.lds index f2c9f94f74..fd0f1b5d4f 100644 --- a/arch/mips/cpu/u-boot.lds +++ b/arch/mips/cpu/u-boot.lds @@ -41,16 +41,22 @@ SECTIONS __image_copy_end = .; __init_end = .; - /* - * .rel must come last so that the mips-relocs tool can shrink - * the section size & the PT_LOAD program header filesz. - */ - .rel : { + .data.reloc : { __rel_start = .; - BYTE(0x0) - . += (32 * 1024) - 1; + /* + * Space for relocation table + * This needs to be filled so that the + * mips-reloc tool can overwrite the content. + * An invalid value is left at the start of the + * section to abort relocation if the table + * has not been filled in. + */ + LONG(0xFFFFFFFF); + FILL(0); + . += CONFIG_MIPS_RELOCATION_TABLE_SIZE - 4; } + . = ALIGN(4); _end = .; .bss __rel_start (OVERLAY) : { |