mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 02:30:03 +01:00
Roger Pau Monne
792988396a
Updated ipxe to current tree, which is 540e5960dc6b49eacf367f7c319fd0546474b845: Provide PXENV_FILE_EXIT_HOOK only for ipxelinux.0 builds Removed all the backported patches and updated boot_prompt_option.patch to apply against current ipxe. Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Committed-by: Ian Jackson <ian.jackson.citrix.com>
37 lines
894 B
Diff
37 lines
894 B
Diff
diff --git a/src/arch/i386/prefix/romprefix.S b/src/arch/i386/prefix/romprefix.S
|
|
index 0f92415..cce7505 100644
|
|
--- a/src/arch/i386/prefix/romprefix.S
|
|
+++ b/src/arch/i386/prefix/romprefix.S
|
|
@@ -391,6 +391,7 @@ no_pmm:
|
|
xorw %di, %di
|
|
cs rep movsb
|
|
|
|
+#ifndef NO_POST_PROMPT
|
|
/* Prompt for POST-time shell */
|
|
movw $init_message_prompt, %si
|
|
xorw %di, %di
|
|
@@ -418,6 +419,7 @@ no_pmm:
|
|
pushw %cs
|
|
call exec
|
|
2:
|
|
+#endif
|
|
/* Restore registers */
|
|
popw %gs
|
|
popw %fs
|
|
@@ -546,6 +548,7 @@ init_message_pmm:
|
|
init_message_int19:
|
|
.asciz " INT19"
|
|
.size init_message_int19, . - init_message_int19
|
|
+#ifndef NO_POST_PROMPT
|
|
init_message_prompt:
|
|
.asciz "\nPress Ctrl-B to configure "
|
|
.size init_message_prompt, . - init_message_prompt
|
|
@@ -555,6 +558,7 @@ init_message_dots:
|
|
init_message_done:
|
|
.asciz "\n\n"
|
|
.size init_message_done, . - init_message_done
|
|
+#endif
|
|
|
|
/* PCI bus:dev.fn
|
|
*
|