summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-01-16 07:04:19 -0700
committerBin Meng <bmeng.cn@gmail.com>2017-02-07 13:07:33 +0800
commit8cfc966c777ae0effaeea40a96d62034b2f86b91 (patch)
tree7905e0e6c58ce4e475a3a5641e317bf2ab7b77fc
parent337705833c8f73560af8f4c163ed6b0d9e5440af (diff)
downloadu-boot-imx-8cfc966c777ae0effaeea40a96d62034b2f86b91.zip
u-boot-imx-8cfc966c777ae0effaeea40a96d62034b2f86b91.tar.gz
u-boot-imx-8cfc966c777ae0effaeea40a96d62034b2f86b91.tar.bz2
x86: Move call64 to the i386 directory
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@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
-rw-r--r--arch/x86/cpu/Makefile2
-rw-r--r--arch/x86/cpu/i386/Makefile1
-rw-r--r--arch/x86/cpu/i386/call64.S (renamed from arch/x86/cpu/call64.S)0
3 files changed, 2 insertions, 1 deletions
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@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
index 970c461..970c461 100644
--- a/arch/x86/cpu/call64.S
+++ b/arch/x86/cpu/i386/call64.S