From d36badfdc6a47ae1377dde809c9ea6f6249f5c15 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 7 Nov 2016 08:47:13 -0700 Subject: [PATCH] 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 Signed-off-by: Alexander Graf --- arch/x86/config.mk | 2 +- arch/x86/{cpu/efi => lib}/elf_ia32_efi.lds | 0 arch/x86/{cpu/efi => lib}/elf_x86_64_efi.lds | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename arch/x86/{cpu/efi => lib}/elf_ia32_efi.lds (100%) rename arch/x86/{cpu/efi => lib}/elf_x86_64_efi.lds (100%) diff --git a/arch/x86/config.mk b/arch/x86/config.mk index d7addd8728..a17abbbffd 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 similarity index 100% rename from arch/x86/cpu/efi/elf_ia32_efi.lds rename to 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 similarity index 100% rename from arch/x86/cpu/efi/elf_x86_64_efi.lds rename to arch/x86/lib/elf_x86_64_efi.lds -- 2.25.1