diff options
author | Tom Rini <trini@konsulko.com> | 2017-12-17 23:37:29 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-12-17 23:37:29 +0300 |
commit | a9e670d46f1916d6fb925244d5d4c9a48db8e26b (patch) | |
tree | 87a6ed8056c8eb58e30756179bac8d22794b8de3 /arch | |
parent | 15616a0aa58173bce1efe47569bf2e10d023ae9c (diff) | |
parent | bde6bfe4c3234480a0eef3b5bda8cf5fc83d3c79 (diff) | |
download | u-boot-a9e670d46f1916d6fb925244d5d4c9a48db8e26b.tar.xz |
Merge tag 'signed-efi-v2018.01' of git://github.com/agraf/u-boot
Patch queue for efi - 2017-12-17
A few fixes for 2018.01:
- Compile fix with helloworld example
- DP match fix (fixes FreeBSD loader and grub on block storage)
- More DP fixes for SD, block
- Fix use-after-free
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/lib/elf_arm_efi.lds | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/lib/elf_arm_efi.lds b/arch/arm/lib/elf_arm_efi.lds index 59f66a1d4a..15c9c5c672 100644 --- a/arch/arm/lib/elf_arm_efi.lds +++ b/arch/arm/lib/elf_arm_efi.lds @@ -55,16 +55,13 @@ SECTIONS .rel.data : { *(.rel.data) *(.rel.data*) } _data_size = . - _etext; - . = ALIGN(4096); - .dynsym : { *(.dynsym) } - . = ALIGN(4096); - .dynstr : { *(.dynstr) } - . = ALIGN(4096); - .note.gnu.build-id : { *(.note.gnu.build-id) } /DISCARD/ : { *(.rel.reloc) *(.eh_frame) *(.note.GNU-stack) + *(.dynsym) + *(.dynstr) + *(.note.gnu.build-id) + *(.comment) } - .comment 0 : { *(.comment) } } |