File tree Expand file tree Collapse file tree 2 files changed +23
-3
lines changed Expand file tree Collapse file tree 2 files changed +23
-3
lines changed Original file line number Diff line number Diff line change @@ -124,4 +124,10 @@ config MULTBOOT2_FB_TERM
124
124
125
125
endif # ARCH_MULTIBOOT2
126
126
127
+ config ARCH_PVHBOOT
128
+ bool "Append Xen PVH ELF Note"
129
+ default y
130
+ ---help---
131
+ This allow x86 QEMU -kernel boot.
132
+
127
133
endif # ARCH_X86_64
Original file line number Diff line number Diff line change @@ -164,9 +164,6 @@ loader_gdt_ptr:
164
164
165
165
.size __reset_entry, . - __reset_entry
166
166
167
- bsp_done:
168
- .long 0
169
-
170
167
#ifdef CONFIG_SMP
171
168
/****************************************************************************
172
169
* Name: __ap_entry
@@ -477,6 +474,9 @@ __enable_pcid:
477
474
478
475
.section ".loader.data" , "ax"
479
476
477
+ bsp_done:
478
+ .long 0
479
+
480
480
/* TSS (IST) for 64 bit long mode will be filled in up_irq. */
481
481
.align (16 )
482
482
g_ist64_low:
@@ -539,3 +539,17 @@ g_pt_low:
539
539
.fill X86_NUM_PAGE_ENTRY * X86_NUM_PAGE_ENTRY, X86_PAGE_ENTRY_SIZE, 0
540
540
.fill X86_NUM_PAGE_ENTRY * X86_NUM_PAGE_ENTRY, X86_PAGE_ENTRY_SIZE, 0
541
541
.fill X86_NUM_PAGE_ENTRY * X86_NUM_PAGE_ENTRY, X86_PAGE_ENTRY_SIZE, 0
542
+
543
+ #ifdef CONFIG_ARCH_PVHBOOT
544
+ /* PVH Header with pvh_start_addr = start32 */
545
+ .pushsection .note.nuttx, "a" , @note
546
+ .align 4
547
+ .long 2f - 1f
548
+ .long 4f - 3f
549
+ .long 18
550
+ 1: .asciz "nuttx"
551
+ 2: .align 4
552
+ 3: .long start32
553
+ 4: .align 4
554
+ .popsection
555
+ #endif
You can’t perform that action at this time.
0 commit comments