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 <s...@chromium.org>
Reviewed-by: Bin Meng <bmeng...@gmail.com>
---
Changes in v3: None
Changes in v2: None
arch/x86/cpu/Makefile | 3 ---
arch/x86/cpu/i386/Makefile | 1 +
arch/x86/cpu/{ => i386}/setjmp.S | 0
3 files changed, 1 insertion(+), 3 deletions(-)
rename arch/x86/cpu/{ => i386}/setjmp.S (100%)
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile
index 2fda32d29f4..45f95ab0349 100644
--- a/arch/x86/cpu/Makefile
+++ b/arch/x86/cpu/Makefile
@@ -14,9 +14,6 @@ else
extra-y = start.o
endif
extra-$(CONFIG_$(SPL_)X86_16BIT_INIT) += resetvec.o start16.o
-ifndef CONFIG_$(SPL_)X86_64
-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 2547bbaa635..0c47252610d 100644
--- a/arch/x86/cpu/i386/Makefile
+++ b/arch/x86/cpu/i386/Makefile
@@ -6,3 +6,4 @@
obj-y += call64.o
obj-y += cpu.o
obj-y += interrupt.o
+obj-y += setjmp.o
diff --git a/arch/x86/cpu/setjmp.S b/arch/x86/cpu/i386/setjmp.S
similarity index 100%
rename from arch/x86/cpu/setjmp.S
rename to arch/x86/cpu/i386/setjmp.S
--
2.11.0.483.g087da7b7c-goog
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
