summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Stoltz <stoltz@google.com>2015-08-04 12:33:42 -0600
committerSimon Glass <sjg@chromium.org>2015-08-05 08:44:05 -0600
commit3f1c046cea8db2495b55a2b924f2f1b60c9997db (patch)
treee9fc6e7381bf8c7f8375e2d9bcb79b8c39fc7d40
parent484cce0d2d86e0a3992ce577cd7045ba6ea72060 (diff)
downloadu-boot-imx-3f1c046cea8db2495b55a2b924f2f1b60c9997db.zip
u-boot-imx-3f1c046cea8db2495b55a2b924f2f1b60c9997db.tar.gz
u-boot-imx-3f1c046cea8db2495b55a2b924f2f1b60c9997db.tar.bz2
x86: Set up toolchain flags for running as EFI application
Adjust the toolchain flags to build U-Boot as a relocatable shared library, as required by EFI. Signed-off-by: Ben Stoltz <stoltz@google.com> Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com>
-rw-r--r--arch/x86/config.mk30
1 files changed, 27 insertions, 3 deletions
diff --git a/arch/x86/config.mk b/arch/x86/config.mk
index 999143e..e27f84a 100644
--- a/arch/x86/config.mk
+++ b/arch/x86/config.mk
@@ -8,19 +8,43 @@
CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
PLATFORM_CPPFLAGS += -fno-strict-aliasing
-PLATFORM_CPPFLAGS += -mregparm=3
PLATFORM_CPPFLAGS += -fomit-frame-pointer
PF_CPPFLAGS_X86 := $(call cc-option, -fno-toplevel-reorder, \
$(call cc-option, -fno-unit-at-a-time)) \
$(call cc-option, -mpreferred-stack-boundary=2)
+
PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_X86)
PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm
PLATFORM_CPPFLAGS += -march=i386 -m32
PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden
-PLATFORM_LDFLAGS += --emit-relocs -Bsymbolic -Bsymbolic-functions -m elf_i386
+PLATFORM_LDFLAGS += -Bsymbolic -Bsymbolic-functions -m elf_i386
-LDFLAGS_FINAL += --gc-sections -pie
LDFLAGS_FINAL += --wrap=__divdi3 --wrap=__udivdi3
LDFLAGS_FINAL += --wrap=__moddi3 --wrap=__umoddi3
+
+OBJCOPYFLAGS_EFI := -j .text -j .sdata -j .data -j .dynamic -j .dynsym \
+ -j .rel -j .rela -j .reloc
+
+CFLAGS_NON_EFI := -mregparm=3
+CFLAGS_EFI := -fpic -fshort-wchar
+
+EFIARCH = ia32
+
+LDSCRIPT_EFI := $(srctree)/$(CPUDIR)/efi/elf_$(EFIARCH)_efi.lds
+OBJCOPYFLAGS_EFI += --target=efi-app-$(EFIARCH)
+
+ifeq ($(CONFIG_EFI_APP),y)
+
+PLATFORM_CPPFLAGS += $(CFLAGS_EFI)
+LDFLAGS_FINAL += -znocombreloc -shared
+LDSCRIPT := $(LDSCRIPT_EFI)
+
+else
+
+PLATFORM_CPPFLAGS += $(CFLAGS_NON_EFI)
+PLATFORM_LDFLAGS += --emit-relocs
+LDFLAGS_FINAL += --gc-sections -pie
+
+endif