From 4d3ac6c3268d39929488c14d913af30f8de0368b Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 16 Jan 2017 07:04:20 -0700 Subject: [PATCH] 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 Reviewed-by: Bin Meng --- 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 2fda32d29f..45f95ab034 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 2547bbaa63..0c47252610 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.39.5