diff --git a/repos/base-nova/ports/nova.hash b/repos/base-nova/ports/nova.hash index d4f3dbe3fe..9a4fac5dd0 100644 --- a/repos/base-nova/ports/nova.hash +++ b/repos/base-nova/ports/nova.hash @@ -1 +1 @@ -ee0aec8bb0626c61e73bc3c12d6cb5bf36ca9f79 +0cf1d38402aae7cab3f19a01c791d3ee9b90545c diff --git a/repos/base-nova/ports/nova.port b/repos/base-nova/ports/nova.port index 94533b64de..d3603866ed 100644 --- a/repos/base-nova/ports/nova.port +++ b/repos/base-nova/ports/nova.port @@ -4,7 +4,7 @@ DOWNLOADS := nova.git # r10 branch URL(nova) := https://github.com/alex-ab/NOVA.git -REV(nova) := 2c8839886ad502be654273c0ac4cddca50432e86 +REV(nova) := e232309084397f7d621ccfa810941db3ea9e8ff6 DIR(nova) := src/kernel/nova PATCHES := $(sort $(wildcard $(REP_DIR)/patches/*.patch)) diff --git a/repos/gems/run/sculpt.run b/repos/gems/run/sculpt.run index 8ac6148dc1..43150bd26a 100644 --- a/repos/gems/run/sculpt.run +++ b/repos/gems/run/sculpt.run @@ -39,14 +39,14 @@ proc log_core { } { if {[log_core]} { if {[have_spec nova]} { - proc kernel_output { } { return "novga serial logmem" } + proc kernel_output { } { return "serial logmem" } } } else { # disable default enabled serial log output via core proc boot_output { } { return "" } if {[have_spec nova]} { - proc kernel_output { } { return "novga logmem" } + proc kernel_output { } { return "logmem" } } } diff --git a/repos/libports/run/acpi_suspend.run b/repos/libports/run/acpi_suspend.run index 76ecabb8fc..2c5777535a 100644 --- a/repos/libports/run/acpi_suspend.run +++ b/repos/libports/run/acpi_suspend.run @@ -30,7 +30,7 @@ if { if {[have_spec nova]} { # enable logmem to get kernel logs in memory - proc kernel_output { } { return "novga logmem" } + proc kernel_output { } { return "logmem" } } diff --git a/repos/os/run/log_core.run b/repos/os/run/log_core.run index c690721b55..9818ecb1bc 100644 --- a/repos/os/run/log_core.run +++ b/repos/os/run/log_core.run @@ -13,7 +13,7 @@ proc log_service { } { } if {[have_spec nova]} { - proc kernel_output { } { return "novga logmem" } + proc kernel_output { } { return "logmem" } } build { diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index 641ae93364..6fbe4e0ad1 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -16,7 +16,7 @@ if { [get_cmd_switch --autopilot] && [have_spec x86_32] } { } if {[have_spec nova]} { - proc kernel_output { } { return "novga logmem" } + proc kernel_output { } { return "logmem" } } create_boot_directory diff --git a/tool/run/boot_dir/nova b/tool/run/boot_dir/nova index ed11c74efa..5272791ebd 100644 --- a/tool/run/boot_dir/nova +++ b/tool/run/boot_dir/nova @@ -31,7 +31,7 @@ proc binary_name_core_a { } { return "core-nova.a" } proc binary_name_timer { } { return "nova_timer_drv" } proc kernel_files { } { return hypervisor } -proc kernel_output { } { return "novga serial" } +proc kernel_output { } { return "serial" } proc boot_output { } { return "serial" } @@ -129,7 +129,7 @@ proc run_boot_dir {binaries} { if {[apply_microcode]} { puts $fh " module2 /boot/micro.code micro.code" } - puts $fh " module2 /boot/hypervisor hypervisor iommu novpid [kernel_output]" + puts $fh " module2 /boot/hypervisor hypervisor iommu [kernel_output]" puts $fh " module2 /boot/image.elf.gz image.elf" puts $fh "}" close $fh @@ -154,7 +154,7 @@ proc run_boot_dir {binaries} { if {[apply_microcode]} { puts $fh " load /boot/micro.code micro.code" } - puts $fh " load /boot/hypervisor iommu novpid [kernel_output]" + puts $fh " load /boot/hypervisor iommu [kernel_output]" puts $fh " load /boot/image.elf" close $fh