From c2be20d2a05df6e30bcdfcd36c265c3dda6cdec6 Mon Sep 17 00:00:00 2001 From: Jason Chen CJ Date: Thu, 6 Dec 2018 13:55:14 +0800 Subject: [PATCH] move idt.S and idt.h out of boot component based on previous patch, we can move idt.S and idt.h out of boot component Tracked-On: #1842 Signed-off-by: Jason Chen CJ Acked-by: Eddie Dong --- hypervisor/Makefile | 2 +- hypervisor/arch/x86/boot/cpu_primary.S | 2 -- hypervisor/arch/x86/{boot => }/idt.S | 0 hypervisor/include/arch/x86/{boot => }/idt.h | 0 4 files changed, 1 insertion(+), 3 deletions(-) rename hypervisor/arch/x86/{boot => }/idt.S (100%) rename hypervisor/include/arch/x86/{boot => }/idt.h (100%) diff --git a/hypervisor/Makefile b/hypervisor/Makefile index 7593afb17..6b672aa33 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -126,11 +126,11 @@ export LIB_DEBUG LIB_RELEASE S_SRCS += arch/x86/boot/cpu_primary.S S_SRCS += arch/x86/boot/cpu_save_boot_ctx.S S_SRCS += arch/x86/boot/trampoline.S -S_SRCS += arch/x86/boot/idt.S C_SRCS += boot/reloc.c C_SRCS += boot/acpi.c C_SRCS += boot/dmar_parse.c +S_SRCS += arch/x86/idt.S C_SRCS += arch/x86/ioapic.c C_SRCS += arch/x86/lapic.c C_SRCS += arch/x86/cpu.c diff --git a/hypervisor/arch/x86/boot/cpu_primary.S b/hypervisor/arch/x86/boot/cpu_primary.S index f7f58bf4b..5115bdad7 100644 --- a/hypervisor/arch/x86/boot/cpu_primary.S +++ b/hypervisor/arch/x86/boot/cpu_primary.S @@ -4,8 +4,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include - /* NOTE: * * MISRA C requires that all unsigned constants should have the suffix 'U' diff --git a/hypervisor/arch/x86/boot/idt.S b/hypervisor/arch/x86/idt.S similarity index 100% rename from hypervisor/arch/x86/boot/idt.S rename to hypervisor/arch/x86/idt.S diff --git a/hypervisor/include/arch/x86/boot/idt.h b/hypervisor/include/arch/x86/idt.h similarity index 100% rename from hypervisor/include/arch/x86/boot/idt.h rename to hypervisor/include/arch/x86/idt.h