From fb3933faf3e6115803d94301f3cc288b27390679 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Wed, 16 Jan 2013 11:04:01 +0100 Subject: [PATCH] nova: use bender by default Bender fixes the serial output on modern PC hardware. Prior this patch, it was used only when combined with pulsar. Now, we also use it when booting via GRUB. --- base-nova/run/env | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/base-nova/run/env b/base-nova/run/env index c3974783ae..bbd9382b7b 100644 --- a/base-nova/run/env +++ b/base-nova/run/env @@ -10,8 +10,8 @@ # Install files needed to boot via PXE # proc install_pxe_bootloader_to_run_dir { } { - exec cp [genode_dir]/tool/boot/pulsar [run_dir]/boot/pulsar - exec cp [genode_dir]/tool/boot/bender [run_dir]/boot/bender + exec cp [genode_dir]/tool/boot/pulsar [run_dir]/boot/pulsar + exec cp [genode_dir]/tool/boot/bender [run_dir]/boot/bender } ## @@ -72,7 +72,8 @@ proc build_boot_image {binaries} { puts $fh "timeout 0" puts $fh "default 0" puts $fh "\ntitle Genode on NOVA" - puts $fh " kernel /hypervisor iommu serial" + puts $fh " kernel /boot/bender" + puts $fh " module /hypervisor iommu serial" puts $fh " module /genode/core" puts $fh " module /genode/config" foreach binary $binaries { @@ -80,6 +81,7 @@ proc build_boot_image {binaries} { puts $fh " module /genode/$binary" } } close $fh + install_pxe_bootloader_to_run_dir create_iso_image_from_run_dir # @@ -94,7 +96,6 @@ proc build_boot_image {binaries} { if {$binary != "core"} { puts $fh " load /genode/$binary" } } close $fh - install_pxe_bootloader_to_run_dir }