diff options
author | Simon Glass <sjg@chromium.org> | 2016-11-07 08:47:13 -0700 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2016-11-14 23:24:04 +0100 |
commit | d36badfdc6a47ae1377dde809c9ea6f6249f5c15 (patch) | |
tree | 8ed6b1cfed980836e51e5d5d234ad0936b7cd458 /arch/x86/cpu | |
parent | c65d76ed5f81e54d32f280116caaf45119e4670d (diff) |
x86: Move efi .lds files into the 'lib' directory
These files now need to be in a standard place so that they can be located
by generic Makefile rules. Move them to the 'lib' directory.
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/x86/cpu')
-rw-r--r-- | arch/x86/cpu/efi/elf_ia32_efi.lds | 94 | ||||
-rw-r--r-- | arch/x86/cpu/efi/elf_x86_64_efi.lds | 83 |
2 files changed, 0 insertions, 177 deletions
diff --git a/arch/x86/cpu/efi/elf_ia32_efi.lds b/arch/x86/cpu/efi/elf_ia32_efi.lds deleted file mode 100644 index cd3b0a982d..0000000000 --- a/arch/x86/cpu/efi/elf_ia32_efi.lds +++ /dev/null @@ -1,94 +0,0 @@ -/* - * U-Boot EFI linker script - * - * SPDX-License-Identifier: BSD-2-Clause - * - * Modified from usr/lib32/elf_ia32_efi.lds in gnu-efi - */ - -#include <config.h> - -OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") -OUTPUT_ARCH(i386) -ENTRY(_start) -SECTIONS -{ - image_base = .; - .hash : { *(.hash) } /* this MUST come first, EFI expects it */ - . = ALIGN(4096); - .text : - { - *(.text) - *(.text.*) - *(.gnu.linkonce.t.*) - } - . = ALIGN(4096); - .sdata : - { - *(.got.plt) - *(.got) - *(.srodata) - *(.sdata) - *(.sbss) - *(.scommon) - } - . = ALIGN(4096); - .data : - { - *(.rodata*) - *(.data) - *(.data1) - *(.data.*) - *(.sdata) - *(.got.plt) - *(.got) - /* - * the EFI loader doesn't seem to like a .bss section, so we - * stick it all into .data: - */ - *(.sbss) - *(.scommon) - *(.dynbss) - *(.bss) - *(COMMON) - - /* U-Boot lists and device tree */ - . = ALIGN(8); - *(SORT(.u_boot_list*)); - . = ALIGN(8); - *(.dtb*); - } - - . = ALIGN(4096); - .dynamic : { *(.dynamic) } - . = ALIGN(4096); - .rel : - { - *(.rel.data) - *(.rel.data.*) - *(.rel.got) - *(.rel.stab) - *(.data.rel.ro.local) - *(.data.rel.local) - *(.data.rel.ro) - *(.data.rel*) - *(.rel.u_boot_list*) - } - . = ALIGN(4096); - .reloc : /* This is the PECOFF .reloc section! */ - { - *(.reloc) - } - . = ALIGN(4096); - .dynsym : { *(.dynsym) } - . = ALIGN(4096); - .dynstr : { *(.dynstr) } - . = ALIGN(4096); - /DISCARD/ : - { - *(.rel.reloc) - *(.eh_frame) - *(.note.GNU-stack) - } - .comment 0 : { *(.comment) } -} diff --git a/arch/x86/cpu/efi/elf_x86_64_efi.lds b/arch/x86/cpu/efi/elf_x86_64_efi.lds deleted file mode 100644 index 9d9f05774a..0000000000 --- a/arch/x86/cpu/efi/elf_x86_64_efi.lds +++ /dev/null @@ -1,83 +0,0 @@ -/* - * U-Boot EFI linker script - * - * SPDX-License-Identifier: BSD-2-Clause - * - * Modified from usr/lib32/elf_x86_64_efi.lds in gnu-efi - */ - -#include <config.h> - -OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") -OUTPUT_ARCH(i386:x86-64) -ENTRY(_start) -SECTIONS -{ - image_base = .; - .hash : { *(.hash) } /* this MUST come first, EFI expects it */ - . = ALIGN(4096); - .eh_frame : { - *(.eh_frame) - } - - . = ALIGN(4096); - - .text : { - *(.text) - *(.text.*) - *(.gnu.linkonce.t.*) - } - - . = ALIGN(4096); - - .reloc : { - *(.reloc) - } - - . = ALIGN(4096); - - .data : { - *(.rodata*) - *(.got.plt) - *(.got) - *(.data*) - *(.sdata) - /* the EFI loader doesn't seem to like a .bss section, so we stick - * it all into .data: */ - *(.sbss) - *(.scommon) - *(.dynbss) - *(.bss) - *(COMMON) - *(.rel.local) - - /* U-Boot lists and device tree */ - . = ALIGN(8); - *(SORT(.u_boot_list*)); - . = ALIGN(8); - *(.dtb*); - } - - . = ALIGN(4096); - .dynamic : { *(.dynamic) } - . = ALIGN(4096); - - .rela : { - *(.rela.data*) - *(.rela.got) - *(.rela.stab) - } - - . = ALIGN(4096); - .dynsym : { *(.dynsym) } - . = ALIGN(4096); - .dynstr : { *(.dynstr) } - . = ALIGN(4096); - .ignored.reloc : { - *(.rela.reloc) - *(.eh_frame) - *(.note.GNU-stack) - } - - .comment 0 : { *(.comment) } -} |