diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc
index ab50964b12..da923eba6d 100644
--- a/repos/ports/run/virtualbox_auto.inc
+++ b/repos/ports/run/virtualbox_auto.inc
@@ -28,6 +28,10 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/libiconv \
[depot_user]/src/nitpicker \
[depot_user]/src/part_block \
+ [depot_user]/src/platform_drv \
+ [depot_user]/src/acpi_drv \
+ [depot_user]/src/pci_decode \
+ [depot_user]/src/report_rom \
[depot_user]/src/stdcxx \
[depot_user]/src/vfs \
[depot_user]/src/vfs_pipe \
@@ -50,25 +54,19 @@ if {$use_rumpfs} {
append build_components {
drivers/ahci
drivers/framebuffer
+ drivers/rtc
+ drivers/ps2
+ virtualbox5
}
lappend_if [expr $use_serial] build_components server/log_terminal
-lappend_if [expr $use_vbox5] build_components virtualbox5
-lappend_if [expr $use_ps2] build_components drivers/ps2
lappend_if [expr $use_usb] build_components app/usb_report_filter
-lappend_if [have_spec x86] build_components drivers/rtc
lappend_if [expr $use_ram_fs || $use_usb] build_components lib/vfs_import
lappend_if [expr $use_cpu_load] build_components app/trace_subject_reporter
lappend_if [expr $use_cpu_load] build_components app/cpu_load_display
lappend_if [expr $use_cpu_load] build_components app/top
lappend_if [have_spec nova] build_components app/log_core
-source ${genode_dir}/repos/base/run/platform_drv.inc
-# override defaults of platform_drv.inc
-proc platform_drv_priority {} { return { priority="-1"} }
-
-append_platform_drv_build_components
-
build $build_components
if {$use_rumpfs && !$use_ram_fs} {
@@ -111,6 +109,57 @@ append config {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -118,6 +167,29 @@ append config {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -219,18 +291,6 @@ append_if [expr $use_ram_fs && $use_overlay_from_disk] config {
}
-append_platform_drv_config
-
-append_if [expr $use_ps2] config {
-
-
-
-
-
-
-
- }
-
append_if [expr $use_cpu_load] config {
@@ -373,21 +433,6 @@ append_if [expr $use_usb] config {
}
-append_if [have_board pc] config {
-
-
-
-
- }
-
-append_if [have_spec x86] config {
-
-
-
-
-
- }
-
append_if [expr $use_serial] config {
@@ -406,12 +451,15 @@ install_config $config
append boot_modules {
ahci_drv
+ ps2_drv
+ rtc_drv
+ vesa_fb_drv
qemu-usb.lib.so
libyuv.lib.so
}
+append boot_modules $virtualbox5_binary
lappend_if [expr $use_serial] boot_modules log_terminal
-lappend_if [expr $use_vbox5] boot_modules $virtualbox5_binary
lappend_if [expr $use_ram_fs && !$use_overlay_from_disk] boot_modules $overlay_image
lappend_if [expr $use_cpu_load] boot_modules trace_subject_reporter
lappend_if [expr $use_cpu_load] boot_modules cpu_load_display
@@ -419,9 +467,4 @@ lappend_if [expr $use_cpu_load] boot_modules top
lappend_if [have_spec nova] boot_modules log_core
# platform-specific modules
-lappend_if [expr $use_ps2] boot_modules ps2_drv
lappend_if [expr $use_usb] boot_modules usb_report_filter
-lappend_if [have_board pc] boot_modules vesa_fb_drv
-lappend_if [have_spec x86] boot_modules rtc_drv
-
-append_platform_drv_boot_modules