diff --git a/repos/gems/run/mirage_pretty.run b/repos/gems/run/mirage_pretty.run index efa3081feb..fd3af8d936 100644 --- a/repos/gems/run/mirage_pretty.run +++ b/repos/gems/run/mirage_pretty.run @@ -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" diff --git a/repos/libports/run/qt5_drivers.inc b/repos/libports/run/qt5_drivers.inc index 0fadffbbdf..8823b29f26 100644 --- a/repos/libports/run/qt5_drivers.inc +++ b/repos/libports/run/qt5_drivers.inc @@ -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 { + @@ -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 diff --git a/repos/libports/src/drivers/framebuffer/vesa/target.mk b/repos/libports/src/drivers/framebuffer/vesa/target.mk index 95e7d65700..62c118384d 100644 --- a/repos/libports/src/drivers/framebuffer/vesa/target.mk +++ b/repos/libports/src/drivers/framebuffer/vesa/target.mk @@ -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 diff --git a/repos/os/recipes/raw/drivers_interactive-pbxa9/drivers.config b/repos/os/recipes/raw/drivers_interactive-pbxa9/drivers.config index 6aed5417b2..8c9d95018b 100644 --- a/repos/os/recipes/raw/drivers_interactive-pbxa9/drivers.config +++ b/repos/os/recipes/raw/drivers_interactive-pbxa9/drivers.config @@ -19,6 +19,7 @@ + diff --git a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config index 105e5a69d4..690c997074 100644 --- a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config +++ b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config @@ -76,6 +76,7 @@ + diff --git a/repos/os/src/drivers/framebuffer/spec/exynos5/target.mk b/repos/os/src/drivers/framebuffer/spec/exynos5/target.mk index 1d27f5be8c..b9ee1aee6a 100644 --- a/repos/os/src/drivers/framebuffer/spec/exynos5/target.mk +++ b/repos/os/src/drivers/framebuffer/spec/exynos5/target.mk @@ -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 := diff --git a/repos/os/src/drivers/framebuffer/spec/imx53/target.mk b/repos/os/src/drivers/framebuffer/spec/imx53/target.mk index 617b8666b2..2e62821a89 100644 --- a/repos/os/src/drivers/framebuffer/spec/imx53/target.mk +++ b/repos/os/src/drivers/framebuffer/spec/imx53/target.mk @@ -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) diff --git a/repos/os/src/drivers/framebuffer/spec/omap4/target.mk b/repos/os/src/drivers/framebuffer/spec/omap4/target.mk index 2bbb33e4a2..3ce825f132 100644 --- a/repos/os/src/drivers/framebuffer/spec/omap4/target.mk +++ b/repos/os/src/drivers/framebuffer/spec/omap4/target.mk @@ -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) diff --git a/repos/os/src/drivers/framebuffer/spec/pl11x/pbxa9/target.mk b/repos/os/src/drivers/framebuffer/spec/pl11x/pbxa9/target.mk index ebccc32cbc..0ad73d948e 100644 --- a/repos/os/src/drivers/framebuffer/spec/pl11x/pbxa9/target.mk +++ b/repos/os/src/drivers/framebuffer/spec/pl11x/pbxa9/target.mk @@ -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) diff --git a/repos/os/src/drivers/framebuffer/spec/rpi/target.mk b/repos/os/src/drivers/framebuffer/spec/rpi/target.mk index c16c62a91c..d087274b60 100644 --- a/repos/os/src/drivers/framebuffer/spec/rpi/target.mk +++ b/repos/os/src/drivers/framebuffer/spec/rpi/target.mk @@ -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) diff --git a/repos/ports/run/seoul.inc b/repos/ports/run/seoul.inc index f5ba88266c..1e08a6e593 100644 --- a/repos/ports/run/seoul.inc +++ b/repos/ports/run/seoul.inc @@ -257,6 +257,7 @@ append_if [expr $use_nic_session && $use_nic_bridge] config { append_if $use_framebuffer config { + @@ -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 diff --git a/repos/ports/run/vbox5_genode_usb_hid.run b/repos/ports/run/vbox5_genode_usb_hid.run index 07882d9a54..b20ddc126e 100644 --- a/repos/ports/run/vbox5_genode_usb_hid.run +++ b/repos/ports/run/vbox5_genode_usb_hid.run @@ -142,6 +142,7 @@ append config { + @@ -244,7 +245,7 @@ set boot_modules { core init timer - fb_drv + vesa_fb_drv ps2_drv log_terminal usb_drv diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index 329de16dc4..f42b1fb89e 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -95,6 +95,7 @@ append_if [expr $use_usb] config { append_if [have_spec framebuffer] config { + @@ -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 diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index 5936ba0050..5918bdf9a5 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -348,6 +348,7 @@ append_if [expr $use_usb] config { append_if [have_spec framebuffer] config { + @@ -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 diff --git a/repos/ports/run/virtualbox_nic_router.run b/repos/ports/run/virtualbox_nic_router.run index e47e328c38..c0302cdc10 100644 --- a/repos/ports/run/virtualbox_nic_router.run +++ b/repos/ports/run/virtualbox_nic_router.run @@ -65,6 +65,7 @@ append config { + @@ -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 }