summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-11-07 08:47:13 -0700
committerAlexander Graf <agraf@suse.de>2016-11-14 23:24:04 +0100
commitd36badfdc6a47ae1377dde809c9ea6f6249f5c15 (patch)
tree8ed6b1cfed980836e51e5d5d234ad0936b7cd458 /arch/x86
parentc65d76ed5f81e54d32f280116caaf45119e4670d (diff)
downloadu-boot-imx-d36badfdc6a47ae1377dde809c9ea6f6249f5c15.zip
u-boot-imx-d36badfdc6a47ae1377dde809c9ea6f6249f5c15.tar.gz
u-boot-imx-d36badfdc6a47ae1377dde809c9ea6f6249f5c15.tar.bz2
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')
-rw-r--r--arch/x86/config.mk2
-rw-r--r--arch/x86/lib/elf_ia32_efi.lds (renamed from arch/x86/cpu/efi/elf_ia32_efi.lds)0
-rw-r--r--arch/x86/lib/elf_x86_64_efi.lds (renamed from arch/x86/cpu/efi/elf_x86_64_efi.lds)0
3 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/config.mk b/arch/x86/config.mk
index d7addd8..a17abbb 100644
--- a/arch/x86/config.mk
+++ b/arch/x86/config.mk
@@ -45,7 +45,7 @@ endif
EFIPAYLOAD_BFDARCH = i386
-LDSCRIPT_EFI := $(srctree)/$(CPUDIR)/efi/elf_$(EFIARCH)_efi.lds
+LDSCRIPT_EFI := $(srctree)/arch/x86/lib/elf_$(EFIARCH)_efi.lds
EFISTUB := crt0-efi-$(EFIARCH).o reloc_$(EFIARCH).o
OBJCOPYFLAGS_EFI += --target=efi-app-$(EFIARCH)
diff --git a/arch/x86/cpu/efi/elf_ia32_efi.lds b/arch/x86/lib/elf_ia32_efi.lds
index cd3b0a9..cd3b0a9 100644
--- a/arch/x86/cpu/efi/elf_ia32_efi.lds
+++ b/arch/x86/lib/elf_ia32_efi.lds
diff --git a/arch/x86/cpu/efi/elf_x86_64_efi.lds b/arch/x86/lib/elf_x86_64_efi.lds
index 9d9f057..9d9f057 100644
--- a/arch/x86/cpu/efi/elf_x86_64_efi.lds
+++ b/arch/x86/lib/elf_x86_64_efi.lds