sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/x86_64: Support QEMU PVH ELF loader

Browse Source 
Enabling CONFIG_ARCH_CHIP_INTEL64_PVH_BOOT will allow nuttx.elf loaded by QEMU -kernel parameter.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
This commit is contained in:
ouyangxiangzhen 2024-09-06 18:40:46 +08:00 committed by Xiang Xiao
parent dc92dee353
commit f6e4ab25bd
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86_64/Kconfig
View File

@ -124,4 +124,10 @@ config MULTBOOT2_FB_TERM
endif # ARCH_MULTIBOOT2
config ARCH_PVHBOOT
bool "Append Xen PVH ELF Note"
default y
---help---
This allow x86 QEMU -kernel boot.
endif # ARCH_X86_64

20
arch/x86_64/src/intel64/intel64_head.S
View File

@ -164,9 +164,6 @@ loader_gdt_ptr:
.size __reset_entry, . - __reset_entry
bsp_done:
.long 0
#ifdef CONFIG_SMP
/****************************************************************************
* Name: __ap_entry
@ -477,6 +474,9 @@ __enable_pcid:
.section ".loader.data", "ax"
bsp_done:
.long 0
/* TSS (IST) for 64 bit long mode will be filled in up_irq. */
.align(16)
g_ist64_low:
@ -539,3 +539,17 @@ g_pt_low:
.fill X86_NUM_PAGE_ENTRY * X86_NUM_PAGE_ENTRY, X86_PAGE_ENTRY_SIZE, 0
.fill X86_NUM_PAGE_ENTRY * X86_NUM_PAGE_ENTRY, X86_PAGE_ENTRY_SIZE, 0
.fill X86_NUM_PAGE_ENTRY * X86_NUM_PAGE_ENTRY, X86_PAGE_ENTRY_SIZE, 0
#ifdef CONFIG_ARCH_PVHBOOT
/* PVH Header with pvh_start_addr = start32 */
.pushsection .note.nuttx, "a", @note
.align 4
.long 2f - 1f
.long 4f - 3f
.long 18
1:.asciz "nuttx"
2:.align 4
3:.long start32
4:.align 4
.popsection
#endif