ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NOVA: use grub instead of pxe 

Make pxe optional and use by default grub.
For that to work we use objcopy to repack the elf64
file into elf32.

With this commit more tests succeed. Most
tests use 64M and with that pulsar even does not start
the hypervisor. With 96M more test run however that would
mean to adjust most of the run scripts ...
This commit is contained in:
Alexander Boettcher 2012-06-21 15:10:51 +02:00 committed by Norman Feske
parent a4cac757e2
commit c56c9f586d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base-nova/run/env
View File

@ -57,7 +57,7 @@ proc build_boot_image {binaries} {
if {![nova_external] && ![file exists [nova_kernel]]} { build { kernel } }
puts "using NOVA kernel at [nova_kernel]"
exec cp [nova_kernel] [run_dir]/hypervisor
exec objcopy -O elf32-i386 [nova_kernel] [run_dir]/hypervisor
install_iso_bootloader_to_run_dir

13
tool/run
View File

@ -440,12 +440,13 @@ proc spawn_qemu { wait_for_re timeout_value } {
if {[have_spec platform_vpb926]} { append qemu_args " -M versatilepb -m 128 " }
if {[have_spec platform_vea9x4]} { append qemu_args " -M vexpress-a9 -cpu cortex-a9 -m 256 " }
# on x86, we supply the boot image as ISO image
if {[have_spec x86_64] && [have_spec nova]} {
append qemu_args " -boot n -tftp [run_dir] -bootp boot/pulsar -no-reboot -no-shutdown "
} else {
# on x86, we supply the boot image as ISO image
if {[have_spec x86]} { append qemu_args " -cdrom [run_dir].iso " }
# on x86, we support booting via pxe or iso image [default]
if {[have_spec x86]} {
if {[have_spec boot_pxe]} {
append qemu_args " -boot n -tftp [run_dir] -bootp boot/pulsar -no-reboot -no-shutdown "
} else {
append qemu_args " -cdrom [run_dir].iso "
}
}
# on ARM, we supply the boot image as kernel