restruct boot and bsp dir for firmware stuff

currently, ACRN hypervisor can either boot from sbl/abl or uefi, that's
why we have different firmware method under bsp & boot dirs.
but the fact is that we actually have two different operations based on
different guest boot mode:
1. de-privilege-boot: ACRN hypervisor will boot VM0 in the same context as
native(before entering hypervisor) - it means hypervisor will co-work with
ACRN UEFI bootloader, restore the context env and de-privilege this env
to VM0 guest.
2. direct-boot: ACRN hypervisor will directly boot different pre-launched
VM(including SOS), it will setup guest env by pre-defined configuration,
and prepare guest kernel image, ramdisk which fetch from multiboot modules.

this patch is trying to:
- rename files related with firmware, change them to guest vboot related
- restruct all guest boot stuff in boot & bsp dirs into a new boot/guest dir
- use de-privilege & direct boot to distinguish two different boot operations

this patch is pure file movement, the rename of functions based on old assumption will
be in the following patch.

Changes to be committed:
	modified:   ../efi-stub/Makefile
	modified:   ../efi-stub/boot.c
	modified:   Makefile
	modified:   arch/x86/cpu.c
	modified:   arch/x86/guest/vm.c
	modified:   arch/x86/init.c
	modified:   arch/x86/irq.c
	modified:   arch/x86/trampoline.c
	modified:   boot/acpi.c
	renamed:    bsp/cmdline.c -> boot/cmdline.c
	renamed:    bsp/firmware_uefi.c -> boot/guest/deprivilege_boot.c
	renamed:    boot/uefi/uefi_boot.c -> boot/guest/deprivilege_boot_info.c
	renamed:    bsp/firmware_sbl.c -> boot/guest/direct_boot.c
	renamed:    boot/sbl/multiboot.c -> boot/guest/direct_boot_info.c
	renamed:    bsp/firmware_wrapper.c -> boot/guest/vboot_wrapper.c
	modified:   boot/include/acpi.h
	renamed:    bsp/include/firmware_uefi.h -> boot/include/guest/deprivilege_boot.h
	renamed:    bsp/include/firmware_sbl.h -> boot/include/guest/direct_boot.h
	renamed:    bsp/include/firmware.h -> boot/include/guest/vboot.h
	modified:   include/arch/x86/multiboot.h

Tracked-On: #1842
Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Jason Chen CJ
2019-04-30 13:56:32 +08:00
committed by Eddie Dong
parent c336686321
commit 20f97f7559
19 changed files with 26 additions and 28 deletions

View File

@@ -25,7 +25,7 @@
#include <ld_sym.h>
#include <logmsg.h>
#include <cat.h>
#include <firmware.h>
#include <vboot.h>
#define CPU_UP_TIMEOUT 100U /* millisecond */
#define CPU_DOWN_TIMEOUT 100U /* millisecond */

View File

@@ -21,7 +21,7 @@
#include <pgtable.h>
#include <mmu.h>
#include <logmsg.h>
#include <firmware.h>
#include <vboot.h>
#include <board.h>
vm_sw_loader_t vm_sw_loader;

View File

@@ -14,7 +14,7 @@
#include <vmx.h>
#include <vm.h>
#include <logmsg.h>
#include <firmware.h>
#include <vboot.h>
#include <seed.h>
/* Push sp magic to top of stack for call trace */

View File

@@ -15,7 +15,7 @@
#include <ioapic.h>
#include <lapic.h>
#include <softirq.h>
#include <firmware.h>
#include <vboot.h>
#include <dump.h>
#include <logmsg.h>

View File

@@ -9,7 +9,7 @@
#include <per_cpu.h>
#include <trampoline.h>
#include <reloc.h>
#include <firmware.h>
#include <vboot.h>
#include <ld_sym.h>
static uint64_t trampoline_start16_paddr;