Split OVMF into _code and _vars

assets/debugging/popcorn.elf-gdb.py

@@ -1,4 +1,4 @@
 import time
-time.sleep(2.5)
+time.sleep(3.5)
 gdb.execute("target remote :1234")
 gdb.execute("set waiting = false")

qemu.sh

@@ -3,14 +3,14 @@
 build="$(dirname $0)/build"
 assets="$(dirname $0)/assets"
 debug=""
-flash_name="ovmf.fd"
+flash_name="ovmf_vars"
 gfx="-nographic"
 
 for arg in $@; do
 	case "${arg}" in
 		--debug)
 			debug="-s"
-			flash_name="ovmf_debug.fd"
+			flash_name="ovmf_vars_d"
 			;;
 		--gfx)
 			gfx=""
@@ -40,7 +40,8 @@ fi
 
 touch "${build}/popd_table.data"
 exec qemu-system-x86_64 \
-	-drive "if=pflash,format=raw,file=${build}/${flash_name}" \
+	-drive "if=pflash,format=raw,readonly,file=${assets}/ovmf/x64/ovmf_code.fd" \
+	-drive "if=pflash,format=raw,file=${build}/${flash_name}.fd" \
 	-drive "format=raw,file=${build}/popcorn.img" \
 	-monitor telnet:localhost:45454,server,nowait \
 	-smp 1 \

scripts/templates/build.ninja.j2

@@ -152,11 +152,11 @@ build $
     $modulefile $
     {{ generator }}
 
-build $builddir/ovmf.fd : cp $srcroot/assets/ovmf/x64/ovmf.fd
+build $builddir/ovmf_vars.fd : cp $srcroot/assets/ovmf/x64/ovmf_vars.fd
-    name = ovmf.fd
+    name = ovmf_vars.fd
 
-build $builddir/ovmf_debug.fd : cp $srcroot/assets/ovmf/x64/ovmf_debug.fd
+build $builddir/ovmf_vars_d.fd : cp $srcroot/assets/ovmf/x64/ovmf_vars_d.fd
-    name = ovmf_debug.fd
+    name = ovmf_vars_d.fd
 
 build $builddir/popcorn.elf | $builddir/popcorn.elf.debug : strip $builddir/host/popcorn.elf
     name = kernel