diff options
author | Tom Rini <trini@konsulko.com> | 2016-11-17 11:46:45 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-11-17 11:46:45 -0500 |
commit | 9e40ea04e9f1a70a184504c9e2beb051eb2d9335 (patch) | |
tree | dddf5ab6a2ce464955233c7ae542ec102bb12050 /Makefile | |
parent | 688d1be5ba63be281c2894e74b27209133598e2e (diff) | |
parent | b99ebaf9f01ebe864061818e00beb70cb1ddc635 (diff) | |
download | u-boot-imx-9e40ea04e9f1a70a184504c9e2beb051eb2d9335.zip u-boot-imx-9e40ea04e9f1a70a184504c9e2beb051eb2d9335.tar.gz u-boot-imx-9e40ea04e9f1a70a184504c9e2beb051eb2d9335.tar.bz2 |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2016-11-17
Highlights this time around:
- x86 efi_loader support
- hello world efi test case
- network device name is now representative
- terminal output reports modes correctly
- fix psci reset for ls1043/ls1046
- fix efi_add_runtime_mmio definition for x86
- efi_loader support for ls2080
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -527,6 +527,15 @@ endif endif endif +# These are set by the arch-specific config.mk. Make sure they are exported +# so they can be used when building an EFI application. +export EFI_LDS # Filename of EFI link script in arch/$(ARCH)/lib +export EFI_CRT0 # Filename of EFI CRT0 in arch/$(ARCH)/lib +export EFI_RELOC # Filename of EFU relocation code in arch/$(ARCH)/lib +export CFLAGS_EFI # Compiler flags to add when building EFI app +export CFLAGS_NON_EFI # Compiler flags to remove when building EFI app +export EFI_TARGET # binutils target if EFI is natively supported + # If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use # that (or fail if absent). Otherwise, search for a linker script in a # standard location. @@ -1131,7 +1140,7 @@ quiet_cmd_u-boot_payload ?= LD $@ cmd_u-boot_payload ?= $(LD) $(LDFLAGS_EFI_PAYLOAD) -o $@ \ -T u-boot-payload.lds arch/x86/cpu/call32.o \ lib/efi/efi.o lib/efi/efi_stub.o u-boot.bin.o \ - $(addprefix arch/$(ARCH)/lib/efi/,$(EFISTUB)) + $(addprefix arch/$(ARCH)/lib/,$(EFISTUB)) u-boot-payload: u-boot.bin.o u-boot-payload.lds FORCE $(call if_changed,u-boot_payload) |