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>

hypervisor/arch/x86/boot/cpu_primary.S

@@ -22,7 +22,7 @@
  */
 
 #include <config.h>
-#include <multiboot.h>
+#include <multiboot_std.h>
 
 /* MULTIBOOT HEADER */
 #define MULTIBOOT_HEADER_FLAGS	MULTIBOOT_HEADER_NEED_MEMINFO

hypervisor/arch/x86/e820.c

@@ -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>
 

hypervisor/arch/x86/guest/vm.c

@@ -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>

hypervisor/arch/x86/init.c

@@ -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.

hypervisor/arch/x86/seed/seed.c

@@ -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"

hypervisor/boot/acpi_base.c

@@ -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;
 

hypervisor/boot/boot.c

@@ -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/multiboot_priv.h"

hypervisor/boot/guest/vboot_info.c

@@ -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>

hypervisor/boot/include/boot.h

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#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
+
+#define MAX_BOOTARGS_SIZE		2048U
+
+/* The modules in multiboot are: Pre-launched VM: kernel/ramdisk/acpi; SOS VM: kernel/ramdisk */
+#define MAX_MODULE_NUM			(3U * PRE_VM_NUM + 2U * SOS_VM_NUM)
+
+/* The vACPI module size is fixed to 1MB */
+#define ACPI_MODULE_SIZE		MEM_1M
+
+struct acrn_boot_info {
+	uint32_t		mi_flags;	/* the flags is back-compatible with multiboot1 */
+
+	const char		*mi_cmdline;
+	const char		*mi_loader_name;
+
+	uint32_t		mi_mods_count;
+	struct multiboot_module	mi_mods[MAX_MODULE_NUM];
+
+	uint32_t 		mi_drives_length;
+	uint32_t		mi_drives_addr;
+
+	uint32_t		mi_mmap_entries;
+	struct multiboot_mmap	mi_mmap_entry[MAX_MMAP_ENTRIES];
+
+	const void		*mi_acpi_rsdp_va;
+	struct efi_info		mi_efi_info;
+};
+
+int32_t init_multiboot_info(uint32_t *registers);
+int32_t init_multiboot2_info(uint32_t *registers);
+
+void init_acrn_boot_info(uint32_t *registers);
+int32_t sanitize_acrn_boot_info(struct acrn_boot_info *abi);
+struct acrn_boot_info *get_acrn_boot_info(void);
+
+#endif	/* BOOT_H */

hypervisor/boot/multiboot/multiboot.c

@@ -7,7 +7,7 @@
 #include <types.h>
 #include <errno.h>
 #include <asm/pgtable.h>
-#include <multiboot.h>
+#include <boot.h>
 #include "multiboot_priv.h"
 
 /**

hypervisor/boot/multiboot/multiboot2.c

@@ -6,7 +6,7 @@
 
 #include <types.h>
 #include <errno.h>
-#include <multiboot.h>
+#include <boot.h>
 #include <asm/pgtable.h>
 #include "multiboot_priv.h"
 

hypervisor/common/vm_load.c

@@ -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>
 

hypervisor/debug/console.c

@@ -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;

hypervisor/include/arch/x86/asm/vm_config.h

@@ -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>