| Message ID | 20170116140427.29283-55-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Bin Meng |
| Headers | show |
On Mon, Jan 16, 2017 at 10:04 PM, Simon Glass <sjg@chromium.org> wrote: > 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> > --- > > Changes in v3: None > Changes in v2: None > > 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%) > applied to u-boot-x86, thanks!
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index 6889df34c45..2fda32d29f4 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 d3364955d8e..2547bbaa635 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 similarity index 100% rename from arch/x86/cpu/call64.S rename to arch/x86/cpu/i386/call64.S