| Message ID | 1478533636-17577-12-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | d36badfdc6a47ae1377dde809c9ea6f6249f5c15 |
| Delegated to: | Alexander Graf |
| Headers | show |
> 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> Thanks, applied to efi-next Alex
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 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
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> --- Changes in v4: None Changes in v3: None Changes in v2: None 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%)