HV: modularization: rename multiboot.h to boot.h
Given the structure in multiboot.h could be used for any boot protocol, use a more generic name "boot.h" instead; Tracked-On: #5661 Signed-off-by: Victor Sun <victor.sun@intel.com> Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
This commit is contained in:
parent
e8f726e321
commit
28b7cee412
|
@ -22,7 +22,7 @@
|
|||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <multiboot.h>
|
||||
#include <multiboot_std.h>
|
||||
|
||||
/* MULTIBOOT HEADER */
|
||||
#define MULTIBOOT_HEADER_FLAGS MULTIBOOT_HEADER_NEED_MEMINFO
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <asm/page.h>
|
||||
#include <asm/e820.h>
|
||||
#include <asm/mmu.h>
|
||||
#include <multiboot.h>
|
||||
#include <boot.h>
|
||||
#include <logmsg.h>
|
||||
#include <asm/guest/ept.h>
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <asm/guest/virq.h>
|
||||
#include <asm/lib/bits.h>
|
||||
#include <asm/e820.h>
|
||||
#include <multiboot.h>
|
||||
#include <boot.h>
|
||||
#include <asm/vtd.h>
|
||||
#include <reloc.h>
|
||||
#include <asm/guest/ept.h>
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <logmsg.h>
|
||||
#include <asm/seed.h>
|
||||
#include <asm/boot/ld_sym.h>
|
||||
#include <multiboot.h>
|
||||
#include <boot.h>
|
||||
|
||||
/* boot_regs store the multiboot info magic and address, defined in
|
||||
arch/x86/boot/cpu_primary.S.
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include <sprintf.h>
|
||||
#include <asm/guest/ept.h>
|
||||
#include <logmsg.h>
|
||||
#include <multiboot.h>
|
||||
#include <boot.h>
|
||||
#include <crypto_api.h>
|
||||
#include <asm/seed.h>
|
||||
#include "seed_abl.h"
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include <acrn_common.h>
|
||||
#include <util.h>
|
||||
#include <asm/e820.h>
|
||||
#include <multiboot.h>
|
||||
#include <boot.h>
|
||||
|
||||
static struct acpi_table_rsdp *acpi_rsdp;
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <errno.h>
|
||||
#include <asm/per_cpu.h>
|
||||
#include <asm/irq.h>
|
||||
#include <multiboot.h>
|
||||
#include <boot.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/zeropage.h>
|
||||
#include <asm/seed.h>
|
||||
|
|
|
@ -4,10 +4,12 @@
|
|||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#ifndef MULTIBOOT_H
|
||||
#define MULTIBOOT_H
|
||||
#ifndef BOOT_H
|
||||
#define BOOT_H
|
||||
|
||||
#include <multiboot_std.h>
|
||||
#include <efi.h>
|
||||
#include <vm_configurations.h>
|
||||
|
||||
/* TODO: MAX_MMAP_ENTRIES shall be config by config tool, and same as E820_MAX_ENTRIES */
|
||||
#define MAX_MMAP_ENTRIES 32U
|
||||
|
@ -20,11 +22,6 @@
|
|||
/* The vACPI module size is fixed to 1MB */
|
||||
#define ACPI_MODULE_SIZE MEM_1M
|
||||
|
||||
#ifndef ASSEMBLER
|
||||
|
||||
#include <efi.h>
|
||||
#include <vm_configurations.h>
|
||||
|
||||
struct acrn_boot_info {
|
||||
|
||||
const char *mi_cmdline;
|
||||
|
@ -49,6 +46,4 @@ void init_acrn_boot_info(uint32_t magic, uint32_t info);
|
|||
int32_t sanitize_acrn_boot_info(uint32_t magic, uint32_t info);
|
||||
struct acrn_boot_info *get_acrn_boot_info(void);
|
||||
|
||||
#endif /* ASSEMBLER */
|
||||
|
||||
#endif /* MULTIBOOT_H */
|
||||
#endif /* BOOT_H */
|
|
@ -7,7 +7,7 @@
|
|||
#include <types.h>
|
||||
#include <errno.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <multiboot.h>
|
||||
#include <boot.h>
|
||||
#include <rtl.h>
|
||||
#include <logmsg.h>
|
||||
#include "multiboot_priv.h"
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#include <types.h>
|
||||
#include <errno.h>
|
||||
#include <multiboot.h>
|
||||
#include <boot.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include "multiboot_priv.h"
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <asm/zeropage.h>
|
||||
#include <asm/guest/ept.h>
|
||||
#include <asm/mmu.h>
|
||||
#include <multiboot.h>
|
||||
#include <boot.h>
|
||||
#include <errno.h>
|
||||
#include <logmsg.h>
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#include <acrn_hv_defs.h>
|
||||
#include <asm/guest/vm.h>
|
||||
#include <console.h>
|
||||
#include <multiboot.h>
|
||||
#include <boot.h>
|
||||
#include <dbg_cmd.h>
|
||||
|
||||
struct hv_timer console_timer;
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include <types.h>
|
||||
#include <pci.h>
|
||||
#include <board_info.h>
|
||||
#include <multiboot.h>
|
||||
#include <boot.h>
|
||||
#include <acrn_common.h>
|
||||
#include <vm_uuids.h>
|
||||
#include <vm_configurations.h>
|
||||
|
|
Loading…
Reference in New Issue