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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/gems/run/mirage_pretty.run
View File

@ -40,7 +40,7 @@ append_platform_drv_build_components
build $build_components
set fb_drv "fb_drv"
set fb_drv "vesa_fb_drv"
if {[have_include "image/uefi"]} {
set fb_drv "fb_boot_drv"

13
repos/libports/run/qt5_drivers.inc
View File

@ -22,6 +22,16 @@ proc use_fb_drv { feature_arg } {
return [have_spec framebuffer]
}
proc fb_drv_binary { } {
if {[have_spec exynos5]} { return exynos5_fb_drv }
if {[have_spec omap4]} { return omap4_fb_drv }
if {[have_spec pbxa9]} { return pbxa9_fb_drv }
if {[have_spec x86]} { return vesa_fb_drv }
if {[have_spec imx53]} { return imx53_fb_drv }
if {[have_spec rpi]} { return rpi_fb_drv }
return no_fb_drv_available
}
proc use_fb_sdl { feature_arg } {
upvar $feature_arg feature
return [have_spec linux]
@ -171,6 +181,7 @@ proc drivers_start_nodes { feature_arg } {
append_if [use_fb_drv feature] start_nodes {
<start name="fb_drv">
<binary name="} [fb_drv_binary] {"/>
<resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>
@ -325,7 +336,7 @@ proc drivers_boot_modules { feature_arg } {
append_platform_drv_boot_modules
lappend_if [use_audio_drv feature] boot_modules [audio_drv_binary]
lappend_if [use_fb_drv feature] boot_modules fb_drv
lappend_if [use_fb_drv feature] boot_modules [fb_drv_binary]
lappend_if [use_fb_sdl feature] boot_modules fb_sdl
lappend_if [use_gpio_drv feature] boot_modules [gpio_drv]
lappend_if [use_input_filter feature] boot_modules input_filter

2
repos/libports/src/drivers/framebuffer/vesa/target.mk
View File

@ -1,4 +1,4 @@
TARGET = fb_drv
TARGET = vesa_fb_drv
REQUIRES = x86
SRC_CC = main.cc framebuffer.cc ifx86emu.cc hw_emul.cc
LIBS = base blit x86emu

1
repos/os/recipes/raw/drivers_interactive-pbxa9/drivers.config
View File

@ -19,6 +19,7 @@
<default-policy> <child name="input_filter"/> </default-policy> </service>
<start name="fb_drv">
<binary name="pbxa9_fb_drv"/>
<resource name="RAM" quantum="4M"/>
<provides> <service name="Framebuffer"/> </provides>
<route> <any-service> <parent/> </any-service> </route>

1
repos/os/recipes/raw/drivers_interactive-pc/drivers.config
View File

@ -76,6 +76,7 @@
</start>
<start name="fb_drv" caps="120">
<binary name="vesa_fb_drv"/>
<resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
<route>

5
repos/os/src/drivers/framebuffer/spec/exynos5/target.mk
View File

@ -1,7 +1,8 @@
TARGET = fb_drv
REQUIRES = exynos5
TARGET = exynos5_fb_drv
REQUIRES = arm_v7
SRC_CC += main.cc driver.cc
LIBS += base
INC_DIR += $(PRG_DIR)
INC_DIR += $(call select_from_repositories,include/spec/exynos5)
CC_CXX_WARN_STRICT :=

5
repos/os/src/drivers/framebuffer/spec/imx53/target.mk
View File

@ -1,5 +1,6 @@
TARGET = fb_drv
REQUIRES = imx53
TARGET = imx53_fb_drv
REQUIRES = arm_v7
SRC_CC = main.cc
LIBS = base blit
INC_DIR += $(PRG_DIR)
INC_DIR += $(call select_from_repositories,include/spec/imx53)

4
repos/os/src/drivers/framebuffer/spec/omap4/target.mk
View File

@ -4,8 +4,8 @@
# \date 2012-05-02
#
TARGET = fb_drv
REQUIRES = omap4
TARGET = omap4_fb_drv
REQUIRES = arm_v7
SRC_CC = main.cc
LIBS = base blit
INC_DIR += $(PRG_DIR)

4
repos/os/src/drivers/framebuffer/spec/pl11x/pbxa9/target.mk
View File

@ -1,5 +1,5 @@
TARGET = fb_drv
REQUIRES = pl11x pbxa9
TARGET = pbxa9_fb_drv
REQUIRES = arm_v7
SRC_CC = main.cc
LIBS = base
INC_DIR += $(PRG_DIR)

5
repos/os/src/drivers/framebuffer/spec/rpi/target.mk
View File

@ -1,5 +1,6 @@
TARGET = fb_drv
REQUIRES = rpi
TARGET = rpi_fb_drv
REQUIRES = arm_v6
SRC_CC = main.cc
LIBS = base blit
INC_DIR += $(PRG_DIR)
INC_DIR += $(call select_from_repositories,include/spec/rpi)

3
repos/ports/run/seoul.inc
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

3
repos/ports/run/vbox5_genode_usb_hid.run
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

3
repos/ports/run/virtualbox.run
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

3
repos/ports/run/virtualbox_auto.inc
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

3
repos/ports/run/virtualbox_nic_router.run
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 }