summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-01-16 07:04:20 -0700
committerBin Meng <bmeng.cn@gmail.com>2017-02-07 13:07:36 +0800
commit4d3ac6c3268d39929488c14d913af30f8de0368b (patch)
tree8688c64950c0b49cb6797a1affbbde8bca83c17d /arch/x86
parent8cfc966c777ae0effaeea40a96d62034b2f86b91 (diff)
downloadu-boot-imx-4d3ac6c3268d39929488c14d913af30f8de0368b.zip
u-boot-imx-4d3ac6c3268d39929488c14d913af30f8de0368b.tar.gz
u-boot-imx-4d3ac6c3268d39929488c14d913af30f8de0368b.tar.bz2
x86: Move setjmp 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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/cpu/Makefile3
-rw-r--r--arch/x86/cpu/i386/Makefile1
-rw-r--r--arch/x86/cpu/i386/setjmp.S (renamed from arch/x86/cpu/setjmp.S)0
3 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile
index 2fda32d..45f95ab 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 2547bba..0c47252 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
index 2ea1c6c..2ea1c6c 100644
--- a/arch/x86/cpu/setjmp.S
+++ b/arch/x86/cpu/i386/setjmp.S