From b4ff720ea44b5c417e676afdfafd3ffeb8758260 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Fri, 13 Sep 2024 13:08:10 +0200
Subject: [PATCH] tool/run: support ipxe via UEFI boot on foc & sel4

---
 tool/run/boot_dir/foc  | 17 ++++++++++++-----
 tool/run/boot_dir/sel4 |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tool/run/boot_dir/foc b/tool/run/boot_dir/foc
index 35c4be2ed8..805422c00b 100644
--- a/tool/run/boot_dir/foc
+++ b/tool/run/boot_dir/foc
@@ -92,7 +92,9 @@ proc run_boot_dir_x86 {binaries} {
 
 	exec mv [run_dir]/image.elf [run_dir]/boot/image.elf
 
-	if {[have_include "image/iso"] || [have_include "image/disk"]} {
+	set options_bender "[boot_output]"
+
+	if {[have_include "image/iso"] || [have_include "image/disk"] || [have_include image/uefi]} {
 
 		if {[have_include "image/disk"]} {
 			install_disk_bootloader_to_run_dir
@@ -102,6 +104,11 @@ proc run_boot_dir_x86 {binaries} {
 			install_iso_bootloader_to_run_dir
 		}
 
+		if {[have_include image/uefi]} {
+			install_uefi_bootloader_to_run_dir
+			append options_bender " serial_fallback"
+		}
+
 		#
 		# Generate GRUB2 config file
 		#
@@ -112,7 +119,7 @@ proc run_boot_dir_x86 {binaries} {
 		#
 		puts $fh "menuentry 'Genode on Fiasco.OC' {"
 		puts $fh " insmod multiboot"
-		puts $fh " multiboot /boot/bender [boot_output]"
+		puts $fh " multiboot /boot/bender $options_bender"
 		puts $fh " module /boot/bootstrap"
 		puts $fh " module /boot/kernel fiasco [fiasco_serial_esc_arg]"
 		puts $fh " module /boot/sigma0"
@@ -126,7 +133,7 @@ proc run_boot_dir_x86 {binaries} {
 	#
 	run_image
 
-	if {[have_include "load/tftp"]} {
+	if {[have_spec x86] && [have_include "load/tftp"]} {
 		#
 		# Install PXE bootloader pulsar
 		#
@@ -136,7 +143,7 @@ proc run_boot_dir_x86 {binaries} {
 		# Generate pulsar config file
 		#
 		set fh [open "[run_dir]/config-52-54-00-12-34-56" "WRONLY CREAT TRUNC"]
-		puts $fh " exec /boot/bender [boot_output]"
+		puts $fh " exec /boot/bender $options_bender"
 		puts $fh " load /boot/bootstrap"
 		puts $fh " load /boot/kernel -serial_esc"
 		puts $fh " load /boot/sigma0"
@@ -146,7 +153,7 @@ proc run_boot_dir_x86 {binaries} {
 		generate_tftp_config
 	}
 
-	if {[have_include "load/ipxe"]} {
+	if {[have_spec x86] && [have_include "load/ipxe"]} {
 		create_ipxe_config
 		update_ipxe_boot_dir
 		create_symlink_for_iso
diff --git a/tool/run/boot_dir/sel4 b/tool/run/boot_dir/sel4
index 992ac2818d..e4dd99a406 100644
--- a/tool/run/boot_dir/sel4
+++ b/tool/run/boot_dir/sel4
@@ -69,7 +69,7 @@ proc run_boot_dir {binaries} {
 
 		if {[have_include image/uefi]} {
 			install_uefi_bootloader_to_run_dir
-			set options_bender " serial_fallback"
+			append options_bender " serial_fallback"
 		}
 
 		#