From 0bc85d2ebc57f00f022d2b09daf724130973532f Mon Sep 17 00:00:00 2001 From: Jason Chen CJ Date: Thu, 29 Nov 2018 13:40:21 +0800 Subject: [PATCH] modularization: boot component - move files Boot component prepares the very basic platform boot env. It finally call into platform initilization entries: - bsp_boot_init & cpu_secondary_init for start up - or restore_s3_context for wakeup This patch just move files into reorg dir. Tracked-On: #1842 Signed-off-by: Jason Chen CJ --- hypervisor/Makefile | 13 ++++++++----- hypervisor/arch/x86/{ => boot}/cpu_primary.S | 0 hypervisor/arch/x86/{ => boot}/cpu_save_boot_ctx.S | 0 hypervisor/arch/x86/{ => boot}/idt.S | 0 hypervisor/arch/x86/{ => boot}/trampoline.S | 0 hypervisor/include/arch/x86/{ => boot}/idt.h | 0 6 files changed, 8 insertions(+), 5 deletions(-) rename hypervisor/arch/x86/{ => boot}/cpu_primary.S (100%) rename hypervisor/arch/x86/{ => boot}/cpu_save_boot_ctx.S (100%) rename hypervisor/arch/x86/{ => boot}/idt.S (100%) rename hypervisor/arch/x86/{ => boot}/trampoline.S (100%) rename hypervisor/include/arch/x86/{ => boot}/idt.h (100%) diff --git a/hypervisor/Makefile b/hypervisor/Makefile index 67bdf83cf..45a803040 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -103,6 +103,7 @@ INCLUDE_PATH += include/lib INCLUDE_PATH += include/lib/crypto INCLUDE_PATH += include/common INCLUDE_PATH += include/arch/x86 +INCLUDE_PATH += include/arch/x86/boot INCLUDE_PATH += include/arch/x86/guest INCLUDE_PATH += include/debug INCLUDE_PATH += include/public @@ -122,12 +123,17 @@ export CFLAGS ASFLAGS ARFLAGS LDFLAGS ARCH_CFLAGS ARCH_ASFLAGS ARCH_ARFLAGS ARCH export HV_OBJDIR CONFIG_RELEASE INCLUDE_PATH export LIB_DEBUG LIB_RELEASE +# boot component +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 -C_SRCS += boot/reloc.c C_SRCS += arch/x86/ioapic.c C_SRCS += arch/x86/lapic.c -S_SRCS += arch/x86/trampoline.S C_SRCS += arch/x86/cpu.c C_SRCS += arch/x86/cpuid.c C_SRCS += arch/x86/mmu.c @@ -136,9 +142,6 @@ C_SRCS += arch/x86/page.c C_SRCS += arch/x86/notify.c C_SRCS += arch/x86/vtd.c C_SRCS += arch/x86/gdt.c -S_SRCS += arch/x86/cpu_primary.S -S_SRCS += arch/x86/cpu_save_boot_ctx.S -S_SRCS += arch/x86/idt.S C_SRCS += arch/x86/irq.c C_SRCS += arch/x86/timer.c C_SRCS += arch/x86/ept.c diff --git a/hypervisor/arch/x86/cpu_primary.S b/hypervisor/arch/x86/boot/cpu_primary.S similarity index 100% rename from hypervisor/arch/x86/cpu_primary.S rename to hypervisor/arch/x86/boot/cpu_primary.S diff --git a/hypervisor/arch/x86/cpu_save_boot_ctx.S b/hypervisor/arch/x86/boot/cpu_save_boot_ctx.S similarity index 100% rename from hypervisor/arch/x86/cpu_save_boot_ctx.S rename to hypervisor/arch/x86/boot/cpu_save_boot_ctx.S diff --git a/hypervisor/arch/x86/idt.S b/hypervisor/arch/x86/boot/idt.S similarity index 100% rename from hypervisor/arch/x86/idt.S rename to hypervisor/arch/x86/boot/idt.S diff --git a/hypervisor/arch/x86/trampoline.S b/hypervisor/arch/x86/boot/trampoline.S similarity index 100% rename from hypervisor/arch/x86/trampoline.S rename to hypervisor/arch/x86/boot/trampoline.S diff --git a/hypervisor/include/arch/x86/idt.h b/hypervisor/include/arch/x86/boot/idt.h similarity index 100% rename from hypervisor/include/arch/x86/idt.h rename to hypervisor/include/arch/x86/boot/idt.h