Skip to content

Commit 0bc85d2

Browse files
JasonChenCJlijinxia
authored andcommitted
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 <jason.cj.chen@intel.com>
1 parent 667e044 commit 0bc85d2

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

hypervisor/Makefile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ INCLUDE_PATH += include/lib
103103
INCLUDE_PATH += include/lib/crypto
104104
INCLUDE_PATH += include/common
105105
INCLUDE_PATH += include/arch/x86
106+
INCLUDE_PATH += include/arch/x86/boot
106107
INCLUDE_PATH += include/arch/x86/guest
107108
INCLUDE_PATH += include/debug
108109
INCLUDE_PATH += include/public
@@ -122,12 +123,17 @@ export CFLAGS ASFLAGS ARFLAGS LDFLAGS ARCH_CFLAGS ARCH_ASFLAGS ARCH_ARFLAGS ARCH
122123
export HV_OBJDIR CONFIG_RELEASE INCLUDE_PATH
123124
export LIB_DEBUG LIB_RELEASE
124125

126+
# boot component
127+
S_SRCS += arch/x86/boot/cpu_primary.S
128+
S_SRCS += arch/x86/boot/cpu_save_boot_ctx.S
129+
S_SRCS += arch/x86/boot/trampoline.S
130+
S_SRCS += arch/x86/boot/idt.S
131+
C_SRCS += boot/reloc.c
132+
125133
C_SRCS += boot/acpi.c
126134
C_SRCS += boot/dmar_parse.c
127-
C_SRCS += boot/reloc.c
128135
C_SRCS += arch/x86/ioapic.c
129136
C_SRCS += arch/x86/lapic.c
130-
S_SRCS += arch/x86/trampoline.S
131137
C_SRCS += arch/x86/cpu.c
132138
C_SRCS += arch/x86/cpuid.c
133139
C_SRCS += arch/x86/mmu.c
@@ -136,9 +142,6 @@ C_SRCS += arch/x86/page.c
136142
C_SRCS += arch/x86/notify.c
137143
C_SRCS += arch/x86/vtd.c
138144
C_SRCS += arch/x86/gdt.c
139-
S_SRCS += arch/x86/cpu_primary.S
140-
S_SRCS += arch/x86/cpu_save_boot_ctx.S
141-
S_SRCS += arch/x86/idt.S
142145
C_SRCS += arch/x86/irq.c
143146
C_SRCS += arch/x86/timer.c
144147
C_SRCS += arch/x86/ept.c
File renamed without changes.

0 commit comments

Comments
 (0)