josh/uefi-loader
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: josh:fdc5584110562fecf14ca0648add1d0409ef1c87
Branches Tags
josh:master
...
compare: josh:6b10f3f4d99fe57017e1a4928ea23b7ffd8eacbd
Branches Tags
josh:master

2 Commits
fdc5584110 ... 6b10f3f4d9

Author SHA1 Message Date
Josh Holtrop
6b10f3f4d9 Avoid compilation warning 2022-03-09 16:43:31 -05:00
Josh Holtrop
bb24fb937a Move run task to Rsconscript 2022-03-09 16:43:23 -05:00
3 changed files with 6 additions and 9 deletions
Show Stats Expand all files Collapse all files

7
Makefile
View File

@ -1,7 +0,0 @@
.PHONY: all
all:
@./rscons
.PHONY: run
run: all
qemu-system-x86_64 -bios OVMF.fd -hdb build/e.1/efi-loader.img

6
Rsconscript
View File

@ -18,7 +18,7 @@ class Image < Builder
end end
end end
env do |env| uefi_env = env "uefi" do |env|
env.add_builder(Image) env.add_builder(Image)
env["CC"] = "x86_64-w64-mingw32-gcc" env["CC"] = "x86_64-w64-mingw32-gcc"
env["CPPPATH"] += %w[/usr/include/efi /usr/include/efi/x86_64] env["CPPPATH"] += %w[/usr/include/efi /usr/include/efi/x86_64]
@ -29,3 +29,7 @@ env do |env|
env.Program("^/BOOTX64.EFI", "${sources}") env.Program("^/BOOTX64.EFI", "${sources}")
env.Image("^/efi-loader.img", "^/BOOTX64.EFI") env.Image("^/efi-loader.img", "^/BOOTX64.EFI")
end end
task "run" do
sh %W[qemu-system-x86_64 -bios OVMF.fd -hda #{uefi_env.expand("^/efi-loader.img")}]
end

2
main.c
View File

@ -73,7 +73,7 @@ static void dump_memory_map(void)
UINTN descriptor_size; UINTN descriptor_size;
UINT32 descriptor_version; UINT32 descriptor_version;
EFI_STATUS status = g_system_table->BootServices->GetMemoryMap(&memory_map_size, EFI_STATUS status = g_system_table->BootServices->GetMemoryMap(&memory_map_size,
memory_map_buffer, (EFI_MEMORY_DESCRIPTOR *)memory_map_buffer,
&map_key, &map_key,
&descriptor_size, &descriptor_size,
&descriptor_version); &descriptor_version);