From 8cfc966c777ae0effaeea40a96d62034b2f86b91 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 16 Jan 2017 07:04:19 -0700 Subject: [PATCH] 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 Reviewed-by: Bin Meng --- 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 6889df34c4..2fda32d29f 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 d3364955d8..2547bbaa63 100644 --- a/arch/x86/cpu/i386/Makefile +++ b/arch/x86/cpu/i386/Makefile @@ -3,5 +3,6 @@ # Written by Simon Glass # +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.39.5