[U-Boot] [PATCH 74/82] x86: Move call64 to the i386 directory
Simon Glass
sjg at chromium.org
Mon Sep 26 05:34:17 CEST 2016
This code is only used in 32-bit mode. Move it so that it does not get
built with 64-bit U-Boot.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
arch/x86/cpu/Makefile | 2 +-
arch/x86/cpu/i386/Makefile | 1 +
arch/x86/cpu/{ => i386}/call64.S | 0
3 files changed, 2 insertions(+), 1 deletion(-)
rename arch/x86/cpu/{ => i386}/call64.S (100%)
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile
index 6889df3..2fda32d 100644
--- a/arch/x86/cpu/Makefile
+++ b/arch/x86/cpu/Makefile
@@ -15,7 +15,7 @@ extra-y = start.o
endif
extra-$(CONFIG_$(SPL_)X86_16BIT_INIT) += resetvec.o start16.o
ifndef CONFIG_$(SPL_)X86_64
-obj-y += call64.o setjmp.o
+obj-y += setjmp.o
endif
obj-y += cpu.o cpu_x86.o
diff --git a/arch/x86/cpu/i386/Makefile b/arch/x86/cpu/i386/Makefile
index d336495..2547bba 100644
--- a/arch/x86/cpu/i386/Makefile
+++ b/arch/x86/cpu/i386/Makefile
@@ -3,5 +3,6 @@
# Written by Simon Glass <sjg at chromium.org>
#
+obj-y += call64.o
obj-y += cpu.o
obj-y += interrupt.o
diff --git a/arch/x86/cpu/call64.S b/arch/x86/cpu/i386/call64.S
similarity index 100%
rename from arch/x86/cpu/call64.S
rename to arch/x86/cpu/i386/call64.S
--
2.8.0.rc3.226.g39d4020
More information about the U-Boot
mailing list