[U-Boot] [PATCH 39/48] x86: Add Makefile settings for EFI build

[Simon Glass]

This is not in a good place. I'm hoping that Masahiro can help figure this
one out.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 scripts/Makefile.build | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index ac0554e..9a7d28d 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -294,6 +294,14 @@ $(obj)/%.lst: $(src)/%.c FORCE
 # Compile assembler sources (.S)
 # ---------------------------------------------------------------------------
 
+# TODO(sjg at chromium.org): Move this to a sensible place. It does not seem to
+# work if placed in arch/x86/config.mk, etc. It is placed here so that
+# we use the correct flags when assembling u-boot-dtb.bin.S.
+ifdef CONFIG_X86
+AFLAGS_REMOVE_u-boot-dtb.bin.o += -mregparm=3 -march=i386 -m32
+AFLAGS_u-boot-dtb.bin.o += -fpic -fshort-wchar
+endif
+
 modkern_aflags := $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL)
 
 $(real-objs-m)      : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
-- 
2.4.3.573.g4eafbef