From 8a1743d0a633a5f0df1808e4c796ad90b4047188 Mon Sep 17 00:00:00 2001 From: liwenxiang1 Date: Mon, 14 Oct 2024 20:31:25 +0800 Subject: [PATCH] arch/x86_64: Resolving NUC Boot Failure Issue The segment of the Xen PVH boot protocol was not specified during linking and was placed before .loader.text, causing the boot to fail Signed-off-by: liwenxiang1 --- arch/x86_64/src/intel64/intel64_head.S | 2 +- boards/x86_64/intel64/qemu-intel64/scripts/qemu.ld | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86_64/src/intel64/intel64_head.S b/arch/x86_64/src/intel64/intel64_head.S index 355974e8e9..251b7966f9 100644 --- a/arch/x86_64/src/intel64/intel64_head.S +++ b/arch/x86_64/src/intel64/intel64_head.S @@ -195,8 +195,8 @@ __ap_entry: ****************************************************************************/ .code32 - .section ".multiboot1", "a" #ifdef CONFIG_ARCH_MULTIBOOT1 + .section ".multiboot1", "a" .set MB_FLAG_ALIGNED, 1 /* All boot modules must be loaded aligned */ .set MB_FLAG_MEMINFO, 2 /* Boot with memory maps passing */ .set MB_FLAG_VIDEO, 4 /* Enable video mode */ diff --git a/boards/x86_64/intel64/qemu-intel64/scripts/qemu.ld b/boards/x86_64/intel64/qemu-intel64/scripts/qemu.ld index 61181c0d5d..af3ec7b273 100644 --- a/boards/x86_64/intel64/qemu-intel64/scripts/qemu.ld +++ b/boards/x86_64/intel64/qemu-intel64/scripts/qemu.ld @@ -46,6 +46,7 @@ SECTIONS .loader.rodata : { *(.loader.rodata) + *(.note.nuttx) } .loader.tdata_tbss : {