mirror of
https://github.com/genodelabs/genode.git
synced 2025-02-01 16:58:29 +00:00
os: name fb_drv unambigously (ref #2190)
This commit is contained in:
parent
4550056de7
commit
8d1cfce15e
@ -40,7 +40,7 @@ append_platform_drv_build_components
|
|||||||
|
|
||||||
build $build_components
|
build $build_components
|
||||||
|
|
||||||
set fb_drv "fb_drv"
|
set fb_drv "vesa_fb_drv"
|
||||||
|
|
||||||
if {[have_include "image/uefi"]} {
|
if {[have_include "image/uefi"]} {
|
||||||
set fb_drv "fb_boot_drv"
|
set fb_drv "fb_boot_drv"
|
||||||
|
@ -22,6 +22,16 @@ proc use_fb_drv { feature_arg } {
|
|||||||
return [have_spec framebuffer]
|
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 } {
|
proc use_fb_sdl { feature_arg } {
|
||||||
upvar $feature_arg feature
|
upvar $feature_arg feature
|
||||||
return [have_spec linux]
|
return [have_spec linux]
|
||||||
@ -171,6 +181,7 @@ proc drivers_start_nodes { feature_arg } {
|
|||||||
|
|
||||||
append_if [use_fb_drv feature] start_nodes {
|
append_if [use_fb_drv feature] start_nodes {
|
||||||
<start name="fb_drv">
|
<start name="fb_drv">
|
||||||
|
<binary name="} [fb_drv_binary] {"/>
|
||||||
<resource name="RAM" quantum="4M"/>
|
<resource name="RAM" quantum="4M"/>
|
||||||
<provides><service name="Framebuffer"/></provides>
|
<provides><service name="Framebuffer"/></provides>
|
||||||
</start>
|
</start>
|
||||||
@ -325,7 +336,7 @@ proc drivers_boot_modules { feature_arg } {
|
|||||||
append_platform_drv_boot_modules
|
append_platform_drv_boot_modules
|
||||||
|
|
||||||
lappend_if [use_audio_drv feature] boot_modules [audio_drv_binary]
|
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_fb_sdl feature] boot_modules fb_sdl
|
||||||
lappend_if [use_gpio_drv feature] boot_modules [gpio_drv]
|
lappend_if [use_gpio_drv feature] boot_modules [gpio_drv]
|
||||||
lappend_if [use_input_filter feature] boot_modules input_filter
|
lappend_if [use_input_filter feature] boot_modules input_filter
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
TARGET = fb_drv
|
TARGET = vesa_fb_drv
|
||||||
REQUIRES = x86
|
REQUIRES = x86
|
||||||
SRC_CC = main.cc framebuffer.cc ifx86emu.cc hw_emul.cc
|
SRC_CC = main.cc framebuffer.cc ifx86emu.cc hw_emul.cc
|
||||||
LIBS = base blit x86emu
|
LIBS = base blit x86emu
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
<default-policy> <child name="input_filter"/> </default-policy> </service>
|
<default-policy> <child name="input_filter"/> </default-policy> </service>
|
||||||
|
|
||||||
<start name="fb_drv">
|
<start name="fb_drv">
|
||||||
|
<binary name="pbxa9_fb_drv"/>
|
||||||
<resource name="RAM" quantum="4M"/>
|
<resource name="RAM" quantum="4M"/>
|
||||||
<provides> <service name="Framebuffer"/> </provides>
|
<provides> <service name="Framebuffer"/> </provides>
|
||||||
<route> <any-service> <parent/> </any-service> </route>
|
<route> <any-service> <parent/> </any-service> </route>
|
||||||
|
@ -76,6 +76,7 @@
|
|||||||
</start>
|
</start>
|
||||||
|
|
||||||
<start name="fb_drv" caps="120">
|
<start name="fb_drv" caps="120">
|
||||||
|
<binary name="vesa_fb_drv"/>
|
||||||
<resource name="RAM" quantum="4M"/>
|
<resource name="RAM" quantum="4M"/>
|
||||||
<provides><service name="Framebuffer"/></provides>
|
<provides><service name="Framebuffer"/></provides>
|
||||||
<route>
|
<route>
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
TARGET = fb_drv
|
TARGET = exynos5_fb_drv
|
||||||
REQUIRES = exynos5
|
REQUIRES = arm_v7
|
||||||
SRC_CC += main.cc driver.cc
|
SRC_CC += main.cc driver.cc
|
||||||
LIBS += base
|
LIBS += base
|
||||||
INC_DIR += $(PRG_DIR)
|
INC_DIR += $(PRG_DIR)
|
||||||
|
INC_DIR += $(call select_from_repositories,include/spec/exynos5)
|
||||||
|
|
||||||
CC_CXX_WARN_STRICT :=
|
CC_CXX_WARN_STRICT :=
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
TARGET = fb_drv
|
TARGET = imx53_fb_drv
|
||||||
REQUIRES = imx53
|
REQUIRES = arm_v7
|
||||||
SRC_CC = main.cc
|
SRC_CC = main.cc
|
||||||
LIBS = base blit
|
LIBS = base blit
|
||||||
INC_DIR += $(PRG_DIR)
|
INC_DIR += $(PRG_DIR)
|
||||||
|
INC_DIR += $(call select_from_repositories,include/spec/imx53)
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
# \date 2012-05-02
|
# \date 2012-05-02
|
||||||
#
|
#
|
||||||
|
|
||||||
TARGET = fb_drv
|
TARGET = omap4_fb_drv
|
||||||
REQUIRES = omap4
|
REQUIRES = arm_v7
|
||||||
SRC_CC = main.cc
|
SRC_CC = main.cc
|
||||||
LIBS = base blit
|
LIBS = base blit
|
||||||
INC_DIR += $(PRG_DIR)
|
INC_DIR += $(PRG_DIR)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
TARGET = fb_drv
|
TARGET = pbxa9_fb_drv
|
||||||
REQUIRES = pl11x pbxa9
|
REQUIRES = arm_v7
|
||||||
SRC_CC = main.cc
|
SRC_CC = main.cc
|
||||||
LIBS = base
|
LIBS = base
|
||||||
INC_DIR += $(PRG_DIR)
|
INC_DIR += $(PRG_DIR)
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
TARGET = fb_drv
|
TARGET = rpi_fb_drv
|
||||||
REQUIRES = rpi
|
REQUIRES = arm_v6
|
||||||
SRC_CC = main.cc
|
SRC_CC = main.cc
|
||||||
LIBS = base blit
|
LIBS = base blit
|
||||||
INC_DIR += $(PRG_DIR)
|
INC_DIR += $(PRG_DIR)
|
||||||
|
INC_DIR += $(call select_from_repositories,include/spec/rpi)
|
||||||
|
@ -257,6 +257,7 @@ append_if [expr $use_nic_session && $use_nic_bridge] config {
|
|||||||
|
|
||||||
append_if $use_framebuffer config {
|
append_if $use_framebuffer config {
|
||||||
<start name="fb_drv" priority="-1" caps="130">
|
<start name="fb_drv" priority="-1" caps="130">
|
||||||
|
<binary name="vesa_fb_drv"/>
|
||||||
<resource name="RAM" quantum="8M"/>
|
<resource name="RAM" quantum="8M"/>
|
||||||
<provides><service name="Framebuffer"/></provides>
|
<provides><service name="Framebuffer"/></provides>
|
||||||
<route>
|
<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_block_sata boot_modules ahci_drv
|
||||||
lappend_if $use_nic_session boot_modules ipxe_nic_drv
|
lappend_if $use_nic_session boot_modules ipxe_nic_drv
|
||||||
lappend_if $use_nic_bridge boot_modules nic_bridge
|
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 status_bar
|
||||||
lappend_if $use_fancy_stuff boot_modules launchpad
|
lappend_if $use_fancy_stuff boot_modules launchpad
|
||||||
|
@ -142,6 +142,7 @@ append config {
|
|||||||
</start>
|
</start>
|
||||||
|
|
||||||
<start name="fb_drv" priority="-1">
|
<start name="fb_drv" priority="-1">
|
||||||
|
<binary name="vesa_fb_drv"/>
|
||||||
<resource name="RAM" quantum="4M"/>
|
<resource name="RAM" quantum="4M"/>
|
||||||
<provides><service name="Framebuffer"/></provides>
|
<provides><service name="Framebuffer"/></provides>
|
||||||
</start>
|
</start>
|
||||||
@ -244,7 +245,7 @@ set boot_modules {
|
|||||||
core
|
core
|
||||||
init
|
init
|
||||||
timer
|
timer
|
||||||
fb_drv
|
vesa_fb_drv
|
||||||
ps2_drv
|
ps2_drv
|
||||||
log_terminal
|
log_terminal
|
||||||
usb_drv
|
usb_drv
|
||||||
|
@ -95,6 +95,7 @@ append_if [expr $use_usb] config {
|
|||||||
|
|
||||||
append_if [have_spec framebuffer] config {
|
append_if [have_spec framebuffer] config {
|
||||||
<start name="fb_drv" priority="-1" caps="150">
|
<start name="fb_drv" priority="-1" caps="150">
|
||||||
|
<binary name="vesa_fb_drv"/>
|
||||||
<resource name="RAM" quantum="4M"/>
|
<resource name="RAM" quantum="4M"/>
|
||||||
<provides><service name="Framebuffer"/></provides>
|
<provides><service name="Framebuffer"/></provides>
|
||||||
<config width="1280" height="1024" depth="16" buffered="yes"/>
|
<config width="1280" height="1024" depth="16" buffered="yes"/>
|
||||||
@ -265,7 +266,7 @@ append boot_modules $virtualbox_binary
|
|||||||
# platform-specific modules
|
# platform-specific modules
|
||||||
lappend_if [expr $use_usb] boot_modules usb_drv
|
lappend_if [expr $use_usb] boot_modules usb_drv
|
||||||
lappend_if [expr $use_ps2] boot_modules ps2_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 linux] boot_modules fb_sdl
|
||||||
lappend_if [have_spec x86] boot_modules rtc_drv
|
lappend_if [have_spec x86] boot_modules rtc_drv
|
||||||
|
|
||||||
|
@ -348,6 +348,7 @@ append_if [expr $use_usb] config {
|
|||||||
|
|
||||||
append_if [have_spec framebuffer] config {
|
append_if [have_spec framebuffer] config {
|
||||||
<start name="fb_drv" priority="-1" caps="150">
|
<start name="fb_drv" priority="-1" caps="150">
|
||||||
|
<binary name="vesa_fb_drv"/>
|
||||||
<resource name="RAM" quantum="8M"/>
|
<resource name="RAM" quantum="8M"/>
|
||||||
<provides><service name="Framebuffer"/></provides>
|
<provides><service name="Framebuffer"/></provides>
|
||||||
<config buffered="yes"/>
|
<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_ps2] boot_modules ps2_drv
|
||||||
lappend_if [expr $use_usb] boot_modules usb_drv
|
lappend_if [expr $use_usb] boot_modules usb_drv
|
||||||
lappend_if [expr $use_usb] boot_modules usb_report_filter
|
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
|
lappend_if [have_spec x86] boot_modules rtc_drv
|
||||||
|
|
||||||
append_platform_drv_boot_modules
|
append_platform_drv_boot_modules
|
||||||
|
@ -65,6 +65,7 @@ append config {
|
|||||||
</start>
|
</start>
|
||||||
|
|
||||||
<start name="fb_drv" priority="-1" caps="150">
|
<start name="fb_drv" priority="-1" caps="150">
|
||||||
|
<binary name="vesa_fb_drv"/>
|
||||||
<resource name="RAM" quantum="4M"/>
|
<resource name="RAM" quantum="4M"/>
|
||||||
<provides><service name="Framebuffer"/></provides>
|
<provides><service name="Framebuffer"/></provides>
|
||||||
</start>
|
</start>
|
||||||
@ -384,7 +385,7 @@ append boot_modules { stdcxx.lib.so }
|
|||||||
append boot_modules { qemu-usb.lib.so }
|
append boot_modules { qemu-usb.lib.so }
|
||||||
append boot_modules { dynamic_rom }
|
append boot_modules { dynamic_rom }
|
||||||
append boot_modules { ps2_drv }
|
append boot_modules { ps2_drv }
|
||||||
append boot_modules { fb_drv }
|
append boot_modules { vesa_fb_drv }
|
||||||
append boot_modules { rtc_drv }
|
append boot_modules { rtc_drv }
|
||||||
append boot_modules { usb_drv }
|
append boot_modules { usb_drv }
|
||||||
append boot_modules { vfs.lib.so }
|
append boot_modules { vfs.lib.so }
|
||||||
|
Loading…
x
Reference in New Issue
Block a user