diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-03-07 09:31:47 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-09 07:36:08 +0100 |
| commit | a26786c957bb23c2fbb9e573ef892abf98d834ad (patch) | |
| tree | 31096380fd917e44cbc46078af93763b3d948979 /arch/x86 | |
| parent | 4c29a9511b0d95780c914d1b4277dae4061786d2 (diff) | |
| download | barebox-a26786c957bb23c2fbb9e573ef892abf98d834ad.tar.gz barebox-a26786c957bb23c2fbb9e573ef892abf98d834ad.tar.xz | |
fixup! efi: move x86 efi boot support to x86 arch
As I noted in my other mail, this got lost during the move.
Regards,
Michael
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Makefile | 4 | ||||
| -rw-r--r-- | arch/x86/mach-efi/elf_x86_64_efi.lds.S | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index e837a2df97..c36104c2c0 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -84,8 +84,8 @@ cmd_barebox__ ?= $(LD) $(LDFLAGS) $(LDFLAGS_barebox) -o $@ \ quiet_cmd_efi_image = EFI-IMG $@ cmd_efi_image = $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \ -j .dynsym -j .rel -j .rela -j .reloc -j __barebox_initcalls \ - -j __barebox_cmd -j .barebox_magicvar -j .bbenv.* \ - --target=$(TARGET) $< $@ + -j __barebox_exitcalls -j __barebox_cmd -j .barebox_magicvar \ + -j .bbenv.* --target=$(TARGET) $< $@ KBUILD_BINARY := barebox diff --git a/arch/x86/mach-efi/elf_x86_64_efi.lds.S b/arch/x86/mach-efi/elf_x86_64_efi.lds.S index e1bc2120fa..93d34d17ab 100644 --- a/arch/x86/mach-efi/elf_x86_64_efi.lds.S +++ b/arch/x86/mach-efi/elf_x86_64_efi.lds.S @@ -80,6 +80,7 @@ SECTIONS *(.rela.data*) *(.rela.barebox*) *(.rela.initcall*) + *(.rela.exitcall*) *(.rela.got) *(.rela.stab) } |