os: name fb_drv unambigously (ref #2190)

This commit is contained in:
Stefan Kalkowski
2019-05-03 13:51:49 +02:00
committed by Christian Helmuth
parent 4550056de7
commit 8d1cfce15e
15 changed files with 39 additions and 18 deletions

View File

@ -257,6 +257,7 @@ append_if [expr $use_nic_session && $use_nic_bridge] config {
append_if $use_framebuffer config {
<start name="fb_drv" priority="-1" caps="130">
<binary name="vesa_fb_drv"/>
<resource name="RAM" quantum="8M"/>
<provides><service name="Framebuffer"/></provides>
<route>
@ -441,7 +442,7 @@ lappend_if $use_block_ram boot_modules ram_block
lappend_if $use_block_sata boot_modules ahci_drv
lappend_if $use_nic_session boot_modules ipxe_nic_drv
lappend_if $use_nic_bridge boot_modules nic_bridge
lappend_if $use_framebuffer boot_modules fb_drv
lappend_if $use_framebuffer boot_modules vesa_fb_drv
lappend_if $use_fancy_stuff boot_modules status_bar
lappend_if $use_fancy_stuff boot_modules launchpad

View File

@ -142,6 +142,7 @@ append config {
</start>
<start name="fb_drv" priority="-1">
<binary name="vesa_fb_drv"/>
<resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>
@ -244,7 +245,7 @@ set boot_modules {
core
init
timer
fb_drv
vesa_fb_drv
ps2_drv
log_terminal
usb_drv

View File

@ -95,6 +95,7 @@ append_if [expr $use_usb] config {
append_if [have_spec framebuffer] config {
<start name="fb_drv" priority="-1" caps="150">
<binary name="vesa_fb_drv"/>
<resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
<config width="1280" height="1024" depth="16" buffered="yes"/>
@ -265,7 +266,7 @@ append boot_modules $virtualbox_binary
# platform-specific modules
lappend_if [expr $use_usb] boot_modules usb_drv
lappend_if [expr $use_ps2] boot_modules ps2_drv
lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec framebuffer] boot_modules vesa_fb_drv
lappend_if [have_spec linux] boot_modules fb_sdl
lappend_if [have_spec x86] boot_modules rtc_drv

View File

@ -348,6 +348,7 @@ append_if [expr $use_usb] config {
append_if [have_spec framebuffer] config {
<start name="fb_drv" priority="-1" caps="150">
<binary name="vesa_fb_drv"/>
<resource name="RAM" quantum="8M"/>
<provides><service name="Framebuffer"/></provides>
<config buffered="yes"/>
@ -392,7 +393,7 @@ lappend_if [have_spec nova] boot_modules log_core
lappend_if [expr $use_ps2] boot_modules ps2_drv
lappend_if [expr $use_usb] boot_modules usb_drv
lappend_if [expr $use_usb] boot_modules usb_report_filter
lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec framebuffer] boot_modules vesa_fb_drv
lappend_if [have_spec x86] boot_modules rtc_drv
append_platform_drv_boot_modules

View File

@ -65,6 +65,7 @@ append config {
</start>
<start name="fb_drv" priority="-1" caps="150">
<binary name="vesa_fb_drv"/>
<resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>
@ -384,7 +385,7 @@ append boot_modules { stdcxx.lib.so }
append boot_modules { qemu-usb.lib.so }
append boot_modules { dynamic_rom }
append boot_modules { ps2_drv }
append boot_modules { fb_drv }
append boot_modules { vesa_fb_drv }
append boot_modules { rtc_drv }
append boot_modules { usb_drv }
append boot_modules { vfs.lib.so }