OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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 <liwenxiang1@xiaomi.com>
This commit is contained in:
liwenxiang1 2024-10-14 20:31:25 +08:00 committed by GUIDINGLI
parent 117ac1a507
commit 8a1743d0a6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,8 +195,8 @@ __ap_entry:
****************************************************************************/ ****************************************************************************/
.code32 .code32
.section ".multiboot1", "a"
#ifdef CONFIG_ARCH_MULTIBOOT1 #ifdef CONFIG_ARCH_MULTIBOOT1
.section ".multiboot1", "a"
.set MB_FLAG_ALIGNED, 1 /* All boot modules must be loaded aligned */ .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_MEMINFO, 2 /* Boot with memory maps passing */
.set MB_FLAG_VIDEO, 4 /* Enable video mode */ .set MB_FLAG_VIDEO, 4 /* Enable video mode */

1
boards/x86_64/intel64/qemu-intel64/scripts/qemu.ld
View File

@ -46,6 +46,7 @@ SECTIONS
.loader.rodata : { .loader.rodata : {
*(.loader.rodata) *(.loader.rodata)
*(.note.nuttx)
} }
.loader.tdata_tbss : { .loader.tdata_tbss : {