diff --git a/base-fiasco/mk/spec-fiasco_x86.mk b/base-fiasco/mk/spec-fiasco_x86.mk index 41b1d98f35..09e5c89907 100644 --- a/base-fiasco/mk/spec-fiasco_x86.mk +++ b/base-fiasco/mk/spec-fiasco_x86.mk @@ -3,7 +3,7 @@ # SPECS += x86_32 fiasco -SPECS += pci ps2 vesa +SPECS += pci ps2 vesa framebuffer # # x86-specific L4v2/sys headers diff --git a/base-foc/mk/spec-foc_x86_32.mk b/base-foc/mk/spec-foc_x86_32.mk index 341693d41b..8f71a03e8e 100644 --- a/base-foc/mk/spec-foc_x86_32.mk +++ b/base-foc/mk/spec-foc_x86_32.mk @@ -3,7 +3,7 @@ # SPECS += x86_32 foc -SPECS += pci ps2 vesa +SPECS += pci ps2 vesa framebuffer # # Linker options that are specific for x86 diff --git a/base-foc/mk/spec-foc_x86_64.mk b/base-foc/mk/spec-foc_x86_64.mk index fe126d3447..d2ef268297 100644 --- a/base-foc/mk/spec-foc_x86_64.mk +++ b/base-foc/mk/spec-foc_x86_64.mk @@ -3,7 +3,7 @@ # SPECS += x86_64 foc -SPECS += pci ps2 vesa +SPECS += pci ps2 vesa framebuffer # # Linker options that are specific for x86 diff --git a/base-nova/doc/nova.txt b/base-nova/doc/nova.txt index 6ebad393c8..8eccce0dd4 100644 --- a/base-nova/doc/nova.txt +++ b/base-nova/doc/nova.txt @@ -212,7 +212,7 @@ subdirectory of the Genode build directory and the 'config' file is a copy of ! module /genode/timer ! module /genode/ps2_drv ! module /genode/pci_drv -! module /genode/vesa_drv +! module /genode/fb_drv ! module /genode/launchpad ! module /genode/nitpicker ! module /genode/liquid_fb diff --git a/base-nova/mk/spec-nova.mk b/base-nova/mk/spec-nova.mk index ac92e46562..298770d41f 100644 --- a/base-nova/mk/spec-nova.mk +++ b/base-nova/mk/spec-nova.mk @@ -3,7 +3,7 @@ # SPECS += nova -SPECS += pci ps2 vesa +SPECS += pci ps2 vesa framebuffer # # Linker options that are specific for x86 diff --git a/base-okl4/doc/notes.txt b/base-okl4/doc/notes.txt index 842f5a4cdc..f24491ff04 100644 --- a/base-okl4/doc/notes.txt +++ b/base-okl4/doc/notes.txt @@ -814,7 +814,7 @@ following components: I/O-memory service in core, these requirements become satisfied. If all the hardware-access services within core are in place, we should be able -to start 'vesa_drv', 'ps2_drv', 'nitpicker', 'launchpad'. Furthermore starting +to start 'fb_drv', 'ps2_drv', 'nitpicker', 'launchpad'. Furthermore starting and killing of an additional 'testnit' process via the launchpad should work. However, we will observe that starting another instance of testnit after killing it will not work. In order to fully support restartable components, diff --git a/base-okl4/mk/spec-okl4_x86.mk b/base-okl4/mk/spec-okl4_x86.mk index e1c1a92c10..aa05b6473f 100644 --- a/base-okl4/mk/spec-okl4_x86.mk +++ b/base-okl4/mk/spec-okl4_x86.mk @@ -3,7 +3,7 @@ # SPECS += x86_32 okl4 -SPECS += pci ps2 vesa +SPECS += pci ps2 vesa framebuffer # # Linker options specific for x86 diff --git a/base-okl4/tool/weaver_x86.xml b/base-okl4/tool/weaver_x86.xml index 0c9f535a08..6d848b4926 100644 --- a/base-okl4/tool/weaver_x86.xml +++ b/base-okl4/tool/weaver_x86.xml @@ -70,7 +70,7 @@ - + diff --git a/base-pistachio/mk/spec-pistachio_x86.mk b/base-pistachio/mk/spec-pistachio_x86.mk index 1a77e27c56..957de3d37d 100644 --- a/base-pistachio/mk/spec-pistachio_x86.mk +++ b/base-pistachio/mk/spec-pistachio_x86.mk @@ -3,7 +3,7 @@ # SPECS += x86_32 pistachio -SPECS += pci ps2 vesa +SPECS += pci ps2 vesa framebuffer # # Linker options that are specific for x86 diff --git a/base/mk/spec-platform_panda.mk b/base/mk/spec-platform_panda.mk index b374b7bbd5..448641c4a1 100644 --- a/base/mk/spec-platform_panda.mk +++ b/base/mk/spec-platform_panda.mk @@ -1,7 +1,7 @@ # # Enable peripherals of the platform # -SPECS += omap4 usb cortex_a9 tl16c750 platform_panda +SPECS += omap4 usb cortex_a9 tl16c750 platform_panda framebuffer # # Pull in CPU specifics diff --git a/base/mk/spec-platform_pbxa9.mk b/base/mk/spec-platform_pbxa9.mk index e1d96495ce..252694cfd8 100644 --- a/base/mk/spec-platform_pbxa9.mk +++ b/base/mk/spec-platform_pbxa9.mk @@ -1,7 +1,7 @@ # # Enable peripherals of the platform # -SPECS += pl050 pl11x ps2 pl180 lan9118 pl011 +SPECS += pl050 pl11x ps2 pl180 lan9118 pl011 framebuffer # # Pull in CPU specifics diff --git a/base/mk/spec-platform_vea9x4.mk b/base/mk/spec-platform_vea9x4.mk index 000dabf55d..aa5f64256a 100644 --- a/base/mk/spec-platform_vea9x4.mk +++ b/base/mk/spec-platform_vea9x4.mk @@ -1,7 +1,7 @@ # # Enable peripherals of the platform # -SPECS += pl050 pl11x ps2 pl180 lan9118 pl011 +SPECS += pl050 pl11x ps2 pl180 lan9118 pl011 framebuffer # # Pull in CPU specifics diff --git a/base/mk/spec-platform_vpb926.mk b/base/mk/spec-platform_vpb926.mk index 09d23092c2..3abf37ad53 100644 --- a/base/mk/spec-platform_vpb926.mk +++ b/base/mk/spec-platform_vpb926.mk @@ -3,7 +3,7 @@ REP_INC_DIR += include/platform/vpb926 # # Enable peripherals of the platform # -SPECS += pl050 pl11x pl011 ps2 +SPECS += pl050 pl11x pl011 ps2 framebuffer # # Pull in CPU specifics diff --git a/dde_linux/run/linux_nic_panda.run b/dde_linux/run/linux_nic_panda.run index 8895130e63..bd358a5582 100644 --- a/dde_linux/run/linux_nic_panda.run +++ b/dde_linux/run/linux_nic_panda.run @@ -44,7 +44,6 @@ set config { - @@ -105,7 +104,7 @@ set boot_modules { part_blk l4linux initrd.gz - omap4_fb_drv + fb_drv sd_card_drv usb_drv } diff --git a/gems/run/d3m_boot.run b/gems/run/d3m_boot.run index 982ce26656..125b799dbc 100644 --- a/gems/run/d3m_boot.run +++ b/gems/run/d3m_boot.run @@ -94,7 +94,7 @@ exec touch [run_dir]/libc.lib.so # build_boot_image { core init - pci_drv vesa_drv ps2_drv atapi_drv timer nic_drv usb_drv + pci_drv fb_drv ps2_drv atapi_drv timer nic_drv usb_drv d3m iso9660 } # diff --git a/gems/run/terminal_echo.run b/gems/run/terminal_echo.run index add3b59af1..72fcab9470 100644 --- a/gems/run/terminal_echo.run +++ b/gems/run/terminal_echo.run @@ -41,15 +41,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -90,11 +84,10 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/gems/run/terminal_log.run b/gems/run/terminal_log.run index 0c37a8f55d..7f16df3554 100644 --- a/gems/run/terminal_log.run +++ b/gems/run/terminal_log.run @@ -70,17 +70,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { +append_if [have_spec framebuffer] config { - - - - } - -append_if [have_spec pl11x] config { - - - + } @@ -149,11 +141,10 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/libports/run/avplay.run b/libports/run/avplay.run index 92f1370485..1af7b32b10 100644 --- a/libports/run/avplay.run +++ b/libports/run/avplay.run @@ -78,9 +78,9 @@ append_if [expr [have_spec pci] && ![have_spec acpi]] config { } -append_if [have_spec vesa] config { - - +append_if [have_spec framebuffer] config { + + } @@ -141,11 +141,11 @@ set boot_modules { mediafile } -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec pci] boot_modules acpi_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec pci] boot_modules acpi_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/libports/run/eglgears.run b/libports/run/eglgears.run index 7db3731265..0840dfbb9f 100644 --- a/libports/run/eglgears.run +++ b/libports/run/eglgears.run @@ -45,15 +45,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -119,12 +113,11 @@ set boot_modules { gallium.lib.so libc.lib.so libm.lib.so libc_log.lib.so } -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec i915] boot_modules gallium-i915.lib.so +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec i915] boot_modules gallium-i915.lib.so build_boot_image $boot_modules diff --git a/libports/run/mupdf.run b/libports/run/mupdf.run index b48e04fa12..df44b46ff8 100644 --- a/libports/run/mupdf.run +++ b/libports/run/mupdf.run @@ -42,9 +42,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - +append_if [have_spec framebuffer] config { + + } @@ -89,10 +89,10 @@ set boot_modules { test.pdf } -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/libports/run/sdl.run b/libports/run/sdl.run index a71df30a4f..7b9d7a9536 100644 --- a/libports/run/sdl.run +++ b/libports/run/sdl.run @@ -51,15 +51,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -94,11 +88,10 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/libports/run/test-nicbridge_static.run b/libports/run/test-nicbridge_static.run index 14a9109ecb..6aafa6ce7d 100644 --- a/libports/run/test-nicbridge_static.run +++ b/libports/run/test-nicbridge_static.run @@ -101,11 +101,9 @@ set boot_modules { # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/libports/run/test-nicbridge_static2.run b/libports/run/test-nicbridge_static2.run index 77587042ab..e101bad598 100644 --- a/libports/run/test-nicbridge_static2.run +++ b/libports/run/test-nicbridge_static2.run @@ -154,9 +154,7 @@ set boot_modules { # platform-specific modules lappend_if [have_spec linux] boot_modules fb_sdl lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv build_boot_image $boot_modules diff --git a/os/run/demo.run b/os/run/demo.run index 9f04a95842..253e7bd975 100644 --- a/os/run/demo.run +++ b/os/run/demo.run @@ -54,20 +54,8 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - - - } - -append_if [have_spec omap4] config { - +append_if [have_spec framebuffer] config { + } @@ -114,13 +102,11 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv -lappend_if [have_spec omap4] boot_modules omap4_fb_drv -lappend_if [have_spec usb] boot_modules usb_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec usb] boot_modules usb_drv build_boot_image $boot_modules diff --git a/os/run/framebuffer.run b/os/run/framebuffer.run index c371df2eed..f1f96fad3e 100755 --- a/os/run/framebuffer.run +++ b/os/run/framebuffer.run @@ -48,20 +48,8 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - - - } - -append_if [have_spec omap4] config { - +append_if [have_spec framebuffer] config { + } @@ -85,11 +73,9 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec sdl] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv -lappend_if [have_spec omap4] boot_modules omap4_fb_drv +lappend_if [have_spec sdl] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv build_boot_image $boot_modules diff --git a/os/run/loader.run b/os/run/loader.run index 8b4037e9ce..31d8687d4e 100644 --- a/os/run/loader.run +++ b/os/run/loader.run @@ -52,15 +52,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -98,11 +92,10 @@ install_config $config set boot_modules { core init timer nitpicker testnit loader test-loader } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/os/src/drivers/framebuffer/omap4/target.mk b/os/src/drivers/framebuffer/omap4/target.mk index 3af2203926..98e3b900d3 100644 --- a/os/src/drivers/framebuffer/omap4/target.mk +++ b/os/src/drivers/framebuffer/omap4/target.mk @@ -4,7 +4,7 @@ # \date 2012-05-02 # -TARGET = omap4_fb_drv +TARGET = fb_drv REQUIRES = omap4 SRC_CC = main.cc LIBS = base diff --git a/os/src/drivers/framebuffer/pl11x/pbxa9/target.mk b/os/src/drivers/framebuffer/pl11x/pbxa9/target.mk index 8df1d66ee6..31fd8c879b 100644 --- a/os/src/drivers/framebuffer/pl11x/pbxa9/target.mk +++ b/os/src/drivers/framebuffer/pl11x/pbxa9/target.mk @@ -1,4 +1,4 @@ -TARGET = pl11x_drv +TARGET = fb_drv REQUIRES = pl11x platform_pbxa9 SRC_CC = main.cc video_memory.cc LIBS = base diff --git a/os/src/drivers/framebuffer/pl11x/vea9x4/target.mk b/os/src/drivers/framebuffer/pl11x/vea9x4/target.mk index de662747be..7ec79f16c6 100644 --- a/os/src/drivers/framebuffer/pl11x/vea9x4/target.mk +++ b/os/src/drivers/framebuffer/pl11x/vea9x4/target.mk @@ -1,4 +1,4 @@ -TARGET = pl11x_drv +TARGET = fb_drv REQUIRES = pl11x platform_vea9x4 SRC_CC = main.cc video_memory.cc LIBS = base diff --git a/os/src/drivers/framebuffer/pl11x/vpb926/target.mk b/os/src/drivers/framebuffer/pl11x/vpb926/target.mk index f8785075e9..cd023080ab 100644 --- a/os/src/drivers/framebuffer/pl11x/vpb926/target.mk +++ b/os/src/drivers/framebuffer/pl11x/vpb926/target.mk @@ -1,4 +1,4 @@ -TARGET = pl11x_drv +TARGET = fb_drv REQUIRES = pl11x platform_vpb926 SRC_CC = main.cc video_memory.cc LIBS = base diff --git a/os/src/drivers/framebuffer/vesa/README b/os/src/drivers/framebuffer/vesa/README index b72fd2a873..81eb2f3953 100644 --- a/os/src/drivers/framebuffer/vesa/README +++ b/os/src/drivers/framebuffer/vesa/README @@ -10,7 +10,7 @@ Building instructions 'framebuffer_session' include files to your include search path, e.g., 'INC_DIR += /demo/include' -* Compile; the target will be called 'vesa_drv' --> Good luck +* Compile; the target will be called 'fb_drv' --> Good luck Config arguments ~~~~~~~~~~~~~~~~ diff --git a/os/src/drivers/framebuffer/vesa/target.mk b/os/src/drivers/framebuffer/vesa/target.mk index cd8c90b1e2..d7e7070abd 100644 --- a/os/src/drivers/framebuffer/vesa/target.mk +++ b/os/src/drivers/framebuffer/vesa/target.mk @@ -1,4 +1,4 @@ -TARGET = vesa_drv +TARGET = fb_drv REQUIRES = vesa SRC_CC = main.cc framebuffer.cc ifx86emu.cc hw_emul.cc CC_OPT += -fomit-frame-pointer -DNO_SYS_HEADERS diff --git a/ports-foc/run/l4android.run b/ports-foc/run/l4android.run index 07eb31da10..bfc1cf42b9 100644 --- a/ports-foc/run/l4android.run +++ b/ports-foc/run/l4android.run @@ -139,9 +139,8 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { +append_if [have_spec framebuffer] config { - @@ -159,13 +158,6 @@ append_if [have_spec pl180] config { } -append_if [have_spec pl11x] config { - - - - - } - append_if [have_spec ps2] config { @@ -208,14 +200,13 @@ set boot_modules { root-ginger.gz } -lappend_if [have_spec x86] boot_modules nic_drv -lappend_if [have_spec x86] boot_modules atapi_drv -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv -lappend_if [have_spec lan9118] boot_modules nic_drv -lappend_if [have_spec pl180] boot_modules sd_card_drv -lappend_if [have_spec vesa] boot_modules vesa_drv +lappend_if [have_spec x86] boot_modules nic_drv +lappend_if [have_spec x86] boot_modules atapi_drv +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec lan9118] boot_modules nic_drv +lappend_if [have_spec pl180] boot_modules sd_card_drv if {[have_spec x86]} { set initrd_uri "http://genode.org/files/release-11.11/l4lx/root-ia32-ginger.gz" diff --git a/ports-foc/run/l4linux.run b/ports-foc/run/l4linux.run index ca38e7c284..f53439a21b 100644 --- a/ports-foc/run/l4linux.run +++ b/ports-foc/run/l4linux.run @@ -56,15 +56,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -109,12 +103,11 @@ install_config $config # Boot modules # set boot_modules { core init timer uart_drv l4linux initrd.gz } -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec x86] boot_modules nic_drv -lappend_if [have_spec lan9118] boot_modules nic_drv +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec x86] boot_modules nic_drv +lappend_if [have_spec lan9118] boot_modules nic_drv if {[have_spec x86]} { set uri "http://genode.org/files/release-11.11/l4lx/initrd-ia32.gz" diff --git a/ports-foc/run/linux_panda.run b/ports-foc/run/linux_panda.run index 91213b0cdc..1b9e62f967 100644 --- a/ports-foc/run/linux_panda.run +++ b/ports-foc/run/linux_panda.run @@ -44,7 +44,6 @@ set config { - @@ -111,7 +110,7 @@ set boot_modules { part_blk l4linux initrd.gz - omap4_fb_drv + fb_drv sd_card_drv usb_drv } diff --git a/ports-foc/run/multi_linux.run b/ports-foc/run/multi_linux.run index fec2842fa2..1cab925229 100644 --- a/ports-foc/run/multi_linux.run +++ b/ports-foc/run/multi_linux.run @@ -53,26 +53,11 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { +append_if [have_spec framebuffer] config { - - - - } - -append_if [have_spec pl11x] config { - - - - - } - -append_if [have_spec omap4] config { - - - } + } append_if [have_spec ps2] config { @@ -159,12 +144,10 @@ set boot_modules { l4linux initrd.gz } -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec omap4] boot_modules omap4_fb_drv -lappend_if [have_spec usb] boot_modules usb_drv +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec usb] boot_modules usb_drv if {[have_spec x86]} { set uri "https://github.com/downloads/skalk/genode/busybox-initrd-x86-20120618.gz" diff --git a/ports-foc/run/smp_linux_panda.run b/ports-foc/run/smp_linux_panda.run index 8d3329064f..3aa28d38c9 100644 --- a/ports-foc/run/smp_linux_panda.run +++ b/ports-foc/run/smp_linux_panda.run @@ -45,7 +45,6 @@ set config { - @@ -149,7 +148,7 @@ set boot_modules { timer l4linux initrd.gz - omap4_fb_drv + fb_drv usb_drv terminal terminal_log diff --git a/ports-foc/run/two_linux.run b/ports-foc/run/two_linux.run index e8dabb8194..861ff1a4ad 100644 --- a/ports-foc/run/two_linux.run +++ b/ports-foc/run/two_linux.run @@ -57,26 +57,11 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { +append_if [have_spec framebuffer] config { - - - - } - -append_if [have_spec pl11x] config { - - - - - } - -append_if [have_spec omap4] config { - - - } + } append_if [have_spec ps2] config { @@ -213,14 +198,12 @@ set boot_modules { l4linux initrd.gz } -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec x86] boot_modules nic_drv -lappend_if [have_spec lan9118] boot_modules nic_drv -lappend_if [have_spec omap4] boot_modules omap4_fb_drv -lappend_if [have_spec usb] boot_modules usb_drv +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec x86] boot_modules nic_drv +lappend_if [have_spec lan9118] boot_modules nic_drv +lappend_if [have_spec usb] boot_modules usb_drv if {[have_spec x86]} { set uri "https://github.com/downloads/skalk/genode/busybox-initrd-x86-20120618.gz" diff --git a/ports-foc/run/two_linux_panda.run b/ports-foc/run/two_linux_panda.run index 043290a577..93bc1a8077 100644 --- a/ports-foc/run/two_linux_panda.run +++ b/ports-foc/run/two_linux_panda.run @@ -50,7 +50,6 @@ set config { - @@ -239,7 +238,7 @@ set boot_modules { terminal_log l4linux initrd.gz - omap4_fb_drv + fb_drv sd_card_drv usb_drv ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so libc_ffat.lib.so diff --git a/ports-okl4/config/elfweaver_config b/ports-okl4/config/elfweaver_config index 314816385b..e3201bf2bf 100644 --- a/ports-okl4/config/elfweaver_config +++ b/ports-okl4/config/elfweaver_config @@ -62,7 +62,7 @@ - + diff --git a/ports-okl4/run/lx_block.run b/ports-okl4/run/lx_block.run index fe0a02176c..d256563e5d 100644 --- a/ports-okl4/run/lx_block.run +++ b/ports-okl4/run/lx_block.run @@ -49,7 +49,7 @@ set config { - + @@ -92,7 +92,7 @@ set boot_modules { } lappend boot_modules "core init" # drivers -lappend boot_modules "pci_drv vesa_drv ps2_drv timer rom_loopdev" +lappend boot_modules "pci_drv fb_drv ps2_drv timer rom_loopdev" # oklinux lappend boot_modules "vmlinux initrd.gz tinycore.img" diff --git a/ports/run/arora.run b/ports/run/arora.run index a804e1b9ed..d6f60ea08d 100644 --- a/ports/run/arora.run +++ b/ports/run/arora.run @@ -57,15 +57,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -137,11 +131,10 @@ set boot_modules { # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/ports/run/debug_nitpicker.run b/ports/run/debug_nitpicker.run index b1113c4468..ed59b8410d 100644 --- a/ports/run/debug_nitpicker.run +++ b/ports/run/debug_nitpicker.run @@ -78,15 +78,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -116,10 +110,9 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/ports/run/noux_bash.run b/ports/run/noux_bash.run index 61a92af6aa..9436bb1b80 100644 --- a/ports/run/noux_bash.run +++ b/ports/run/noux_bash.run @@ -84,20 +84,8 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - - - } - -append_if [have_spec omap4] config { - +append_if [have_spec framebuffer] config { + } @@ -190,13 +178,11 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv -lappend_if [have_spec omap4] boot_modules omap4_fb_drv -lappend_if [use_usb_input] boot_modules usb_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [use_usb_input] boot_modules usb_drv build_boot_image $boot_modules diff --git a/ports/run/noux_gdb.run b/ports/run/noux_gdb.run index 15c2139fb7..8f63c75879 100644 --- a/ports/run/noux_gdb.run +++ b/ports/run/noux_gdb.run @@ -106,20 +106,8 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - - - } - -append_if [have_spec omap4] config { - +append_if [have_spec framebuffer] config { + } @@ -240,13 +228,11 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv -lappend_if [have_spec omap4] boot_modules omap4_fb_drv -lappend_if [have_spec usb] boot_modules usb_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec usb] boot_modules usb_drv build_boot_image $boot_modules diff --git a/ports/run/noux_net_lighttpd.run b/ports/run/noux_net_lighttpd.run index dd0f1aa808..868f731a66 100644 --- a/ports/run/noux_net_lighttpd.run +++ b/ports/run/noux_net_lighttpd.run @@ -100,15 +100,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -223,11 +217,10 @@ foreach pkg $noux_pkgs { lappend boot_modules "$pkg.tar" } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/ports/run/noux_net_lynx_interactive.run b/ports/run/noux_net_lynx_interactive.run index 5f0776f0d8..d0114e32b1 100644 --- a/ports/run/noux_net_lynx_interactive.run +++ b/ports/run/noux_net_lynx_interactive.run @@ -82,15 +82,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -181,11 +175,10 @@ foreach pkg $noux_pkgs { lappend boot_modules "$pkg.tar" } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/ports/run/noux_net_openssh_interactive.run b/ports/run/noux_net_openssh_interactive.run index 02da21dae4..cb25406c08 100644 --- a/ports/run/noux_net_openssh_interactive.run +++ b/ports/run/noux_net_openssh_interactive.run @@ -84,15 +84,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -185,11 +179,10 @@ foreach pkg $noux_pkgs { lappend boot_modules "$pkg.tar" } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/ports/run/noux_shell_script.run b/ports/run/noux_shell_script.run index 6985a06712..df64a5a14a 100644 --- a/ports/run/noux_shell_script.run +++ b/ports/run/noux_shell_script.run @@ -66,15 +66,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -162,11 +156,10 @@ foreach pkg $noux_pkgs { lappend boot_modules "$pkg.tar" } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/ports/run/noux_terminal_fs.run b/ports/run/noux_terminal_fs.run index 4b74d3085e..8fb5269c16 100644 --- a/ports/run/noux_terminal_fs.run +++ b/ports/run/noux_terminal_fs.run @@ -74,15 +74,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -99,11 +93,8 @@ append config { } append_if [have_spec ps2] config { } -append_if [have_spec vesa] config { - } -append_if [have_spec pl11x] config { - } append config { + } @@ -201,11 +192,10 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/ports/run/noux_tool_chain.inc b/ports/run/noux_tool_chain.inc index 3d5d1425b2..7613a7ca69 100644 --- a/ports/run/noux_tool_chain.inc +++ b/ports/run/noux_tool_chain.inc @@ -109,15 +109,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -241,11 +235,10 @@ append boot_modules { genode.tar } foreach pkg $platform_pkgs { append boot_modules "$pkg.tar" } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/ports/run/noux_vim.run b/ports/run/noux_vim.run index 836faef329..a06ab72f84 100644 --- a/ports/run/noux_vim.run +++ b/ports/run/noux_vim.run @@ -56,15 +56,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -130,11 +124,10 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/ports/run/vancouver.run b/ports/run/vancouver.run index 5e8a43f072..32a3c88e47 100644 --- a/ports/run/vancouver.run +++ b/ports/run/vancouver.run @@ -212,7 +212,7 @@ append config { - + @@ -233,7 +233,7 @@ append config { - + @@ -259,7 +259,7 @@ install_config $config # generic modules set boot_modules { core init - vesa_drv + fb_drv nitpicker liquid_fb ps2_drv diff --git a/qt4/run/calculatorform.run b/qt4/run/calculatorform.run index ba7793980e..dd6b9d3725 100644 --- a/qt4/run/calculatorform.run +++ b/qt4/run/calculatorform.run @@ -53,15 +53,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -114,11 +108,10 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/qt4/run/previewer.run b/qt4/run/previewer.run index d6e980f21e..c267b2938a 100644 --- a/qt4/run/previewer.run +++ b/qt4/run/previewer.run @@ -53,15 +53,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -118,11 +112,10 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/qt4/run/qpluginwidget.run b/qt4/run/qpluginwidget.run index 85f9e6bebf..90f48bc6be 100644 --- a/qt4/run/qpluginwidget.run +++ b/qt4/run/qpluginwidget.run @@ -56,15 +56,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -130,11 +124,10 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/qt4/run/qt4.run b/qt4/run/qt4.run index 7c88341094..735ce117bd 100644 --- a/qt4/run/qt4.run +++ b/qt4/run/qt4.run @@ -55,15 +55,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -121,11 +115,10 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/qt4/run/qt_avplay.run b/qt4/run/qt_avplay.run index 53f4922c5a..b647b2a004 100644 --- a/qt4/run/qt_avplay.run +++ b/qt4/run/qt_avplay.run @@ -65,15 +65,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -147,11 +141,10 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/qt4/run/tetrix.run b/qt4/run/tetrix.run index 611e82b87c..37800173ef 100644 --- a/qt4/run/tetrix.run +++ b/qt4/run/tetrix.run @@ -53,15 +53,9 @@ append_if [have_spec pci] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec pl11x] config { - - +append_if [have_spec framebuffer] config { + + } @@ -117,11 +111,10 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec ps2] boot_modules ps2_drv build_boot_image $boot_modules diff --git a/qt4/run/textedit.run b/qt4/run/textedit.run index 8a12afa5ad..af6a6f79d8 100644 --- a/qt4/run/textedit.run +++ b/qt4/run/textedit.run @@ -68,14 +68,8 @@ append_if [expr [have_spec pl180] || [have_spec omap4]] config { } -append_if [have_spec vesa] config { - - - - } - -append_if [have_spec omap4] config { - +append_if [have_spec framebuffer] config { + } @@ -87,12 +81,6 @@ append_if [expr ![have_spec ps2] && [have_spec usb]] config { } -append_if [have_spec pl11x] config { - - - - } - append_if [have_spec ps2] config { @@ -159,15 +147,13 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec pci] boot_modules atapi_drv -lappend_if [have_spec vesa] boot_modules vesa_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules pl11x_drv -lappend_if [have_spec omap4] boot_modules sd_card_drv -lappend_if [have_spec omap4] boot_modules omap4_fb_drv -lappend_if [have_spec omap4] boot_modules usb_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec pci] boot_modules atapi_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec omap4] boot_modules sd_card_drv +lappend_if [have_spec omap4] boot_modules usb_drv build_boot_image $boot_modules