Unify framebuffer driver binary names (fix #720)

Introduce 'framebuffer' SPEC variable to distinguish hardware framebuffer
drivers furthermore from the SDL framebuffer driver used by Genode/Linux.
This commit is contained in:
Stefan Kalkowski 2013-04-29 10:51:27 +02:00 committed by Norman Feske
parent 8aad441ef0
commit 8e9e866161
60 changed files with 253 additions and 526 deletions

View File

@ -3,7 +3,7 @@
# #
SPECS += x86_32 fiasco SPECS += x86_32 fiasco
SPECS += pci ps2 vesa SPECS += pci ps2 vesa framebuffer
# #
# x86-specific L4v2/sys headers # x86-specific L4v2/sys headers

View File

@ -3,7 +3,7 @@
# #
SPECS += x86_32 foc SPECS += x86_32 foc
SPECS += pci ps2 vesa SPECS += pci ps2 vesa framebuffer
# #
# Linker options that are specific for x86 # Linker options that are specific for x86

View File

@ -3,7 +3,7 @@
# #
SPECS += x86_64 foc SPECS += x86_64 foc
SPECS += pci ps2 vesa SPECS += pci ps2 vesa framebuffer
# #
# Linker options that are specific for x86 # Linker options that are specific for x86

View File

@ -212,7 +212,7 @@ subdirectory of the Genode build directory and the 'config' file is a copy of
! module /genode/timer ! module /genode/timer
! module /genode/ps2_drv ! module /genode/ps2_drv
! module /genode/pci_drv ! module /genode/pci_drv
! module /genode/vesa_drv ! module /genode/fb_drv
! module /genode/launchpad ! module /genode/launchpad
! module /genode/nitpicker ! module /genode/nitpicker
! module /genode/liquid_fb ! module /genode/liquid_fb

View File

@ -3,7 +3,7 @@
# #
SPECS += nova SPECS += nova
SPECS += pci ps2 vesa SPECS += pci ps2 vesa framebuffer
# #
# Linker options that are specific for x86 # Linker options that are specific for x86

View File

@ -814,7 +814,7 @@ following components:
I/O-memory service in core, these requirements become satisfied. 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 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. and killing of an additional 'testnit' process via the launchpad should work.
However, we will observe that starting another instance of testnit after However, we will observe that starting another instance of testnit after
killing it will not work. In order to fully support restartable components, killing it will not work. In order to fully support restartable components,

View File

@ -3,7 +3,7 @@
# #
SPECS += x86_32 okl4 SPECS += x86_32 okl4
SPECS += pci ps2 vesa SPECS += pci ps2 vesa framebuffer
# #
# Linker options specific for x86 # Linker options specific for x86

View File

@ -70,7 +70,7 @@
<memsection name="pci_drv" file="pci_drv" direct="true" /> <memsection name="pci_drv" file="pci_drv" direct="true" />
<memsection name="nitlog" file="nitlog" direct="true" /> <memsection name="nitlog" file="nitlog" direct="true" />
<memsection name="liquid_fb" file="liquid_fb" direct="true" /> <memsection name="liquid_fb" file="liquid_fb" direct="true" />
<memsection name="vesa_drv" file="vesa_drv" direct="true" /> <memsection name="fb_drv" file="fb_drv" direct="true" />
</pd> </pd>
</image> </image>

View File

@ -3,7 +3,7 @@
# #
SPECS += x86_32 pistachio SPECS += x86_32 pistachio
SPECS += pci ps2 vesa SPECS += pci ps2 vesa framebuffer
# #
# Linker options that are specific for x86 # Linker options that are specific for x86

View File

@ -1,7 +1,7 @@
# #
# Enable peripherals of the platform # 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 # Pull in CPU specifics

View File

@ -1,7 +1,7 @@
# #
# Enable peripherals of the platform # Enable peripherals of the platform
# #
SPECS += pl050 pl11x ps2 pl180 lan9118 pl011 SPECS += pl050 pl11x ps2 pl180 lan9118 pl011 framebuffer
# #
# Pull in CPU specifics # Pull in CPU specifics

View File

@ -1,7 +1,7 @@
# #
# Enable peripherals of the platform # Enable peripherals of the platform
# #
SPECS += pl050 pl11x ps2 pl180 lan9118 pl011 SPECS += pl050 pl11x ps2 pl180 lan9118 pl011 framebuffer
# #
# Pull in CPU specifics # Pull in CPU specifics

View File

@ -3,7 +3,7 @@ REP_INC_DIR += include/platform/vpb926
# #
# Enable peripherals of the platform # Enable peripherals of the platform
# #
SPECS += pl050 pl11x pl011 ps2 SPECS += pl050 pl11x pl011 ps2 framebuffer
# #
# Pull in CPU specifics # Pull in CPU specifics

View File

@ -44,7 +44,6 @@ set config {
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="fb_drv"> <start name="fb_drv">
<binary name="omap4_fb_drv"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start> </start>
@ -105,7 +104,7 @@ set boot_modules {
part_blk part_blk
l4linux l4linux
initrd.gz initrd.gz
omap4_fb_drv fb_drv
sd_card_drv sd_card_drv
usb_drv usb_drv
} }

View File

@ -94,7 +94,7 @@ exec touch [run_dir]/libc.lib.so
# #
build_boot_image { build_boot_image {
core init 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 } d3m iso9660 }
# #

View File

@ -41,15 +41,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -90,11 +84,10 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -70,17 +70,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="fb_drv"> <start name="fb_drv">
<binary name="vesa_drv"/> <resource name="RAM" quantum="4M"/>
<resource name="RAM" quantum="1M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="fb_drv">
<binary name="pl11x_drv"/>
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -149,11 +141,10 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -78,9 +78,9 @@ append_if [expr [have_spec pci] && ![have_spec acpi]] config {
</start> </start>
} }
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -141,11 +141,11 @@ set boot_modules {
mediafile mediafile
} }
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec pci] boot_modules acpi_drv lappend_if [have_spec pci] boot_modules acpi_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -45,15 +45,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -119,12 +113,11 @@ set boot_modules {
gallium.lib.so libc.lib.so libm.lib.so libc_log.lib.so 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 linux] boot_modules fb_sdl
lappend_if [have_spec pci] boot_modules pci_drv lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv lappend_if [have_spec ps2] boot_modules ps2_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 i915] boot_modules gallium-i915.lib.so
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -42,9 +42,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -89,10 +89,10 @@ set boot_modules {
test.pdf test.pdf
} }
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -51,15 +51,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -94,11 +88,10 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -101,11 +101,9 @@ set boot_modules {
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -154,9 +154,7 @@ set boot_modules {
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -54,20 +54,8 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec omap4] config {
<start name="omap4_fb_drv">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -114,13 +102,11 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv lappend_if [have_spec usb] boot_modules usb_drv
lappend_if [have_spec omap4] boot_modules omap4_fb_drv
lappend_if [have_spec usb] boot_modules usb_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -48,20 +48,8 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec omap4] config {
<start name="omap4_fb_drv">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -85,11 +73,9 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec sdl] boot_modules fb_sdl lappend_if [have_spec sdl] boot_modules fb_sdl
lappend_if [have_spec pci] boot_modules pci_drv lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
lappend_if [have_spec omap4] boot_modules omap4_fb_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -52,15 +52,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -98,11 +92,10 @@ install_config $config
set boot_modules { core init timer nitpicker testnit loader test-loader } set boot_modules { core init timer nitpicker testnit loader test-loader }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -4,7 +4,7 @@
# \date 2012-05-02 # \date 2012-05-02
# #
TARGET = omap4_fb_drv TARGET = fb_drv
REQUIRES = omap4 REQUIRES = omap4
SRC_CC = main.cc SRC_CC = main.cc
LIBS = base LIBS = base

View File

@ -1,4 +1,4 @@
TARGET = pl11x_drv TARGET = fb_drv
REQUIRES = pl11x platform_pbxa9 REQUIRES = pl11x platform_pbxa9
SRC_CC = main.cc video_memory.cc SRC_CC = main.cc video_memory.cc
LIBS = base LIBS = base

View File

@ -1,4 +1,4 @@
TARGET = pl11x_drv TARGET = fb_drv
REQUIRES = pl11x platform_vea9x4 REQUIRES = pl11x platform_vea9x4
SRC_CC = main.cc video_memory.cc SRC_CC = main.cc video_memory.cc
LIBS = base LIBS = base

View File

@ -1,4 +1,4 @@
TARGET = pl11x_drv TARGET = fb_drv
REQUIRES = pl11x platform_vpb926 REQUIRES = pl11x platform_vpb926
SRC_CC = main.cc video_memory.cc SRC_CC = main.cc video_memory.cc
LIBS = base LIBS = base

View File

@ -10,7 +10,7 @@ Building instructions
'framebuffer_session' include files to your include search path, e.g., 'framebuffer_session' include files to your include search path, e.g.,
'INC_DIR += <genode dir>/demo/include' 'INC_DIR += <genode 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 Config arguments
~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~

View File

@ -1,4 +1,4 @@
TARGET = vesa_drv TARGET = fb_drv
REQUIRES = vesa REQUIRES = vesa
SRC_CC = main.cc framebuffer.cc ifx86emu.cc hw_emul.cc SRC_CC = main.cc framebuffer.cc ifx86emu.cc hw_emul.cc
CC_OPT += -fomit-frame-pointer -DNO_SYS_HEADERS CC_OPT += -fomit-frame-pointer -DNO_SYS_HEADERS

View File

@ -139,9 +139,8 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="fb_drv"> <start name="fb_drv">
<binary name="vesa_drv"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
<config width="1024" height="768" depth="16" buffered="yes" /> <config width="1024" height="768" depth="16" buffered="yes" />
@ -159,13 +158,6 @@ append_if [have_spec pl180] config {
<provides><service name="Block"/></provides> <provides><service name="Block"/></provides>
</start> } </start> }
append_if [have_spec pl11x] config {
<start name="fb_drv">
<binary name="pl11x_drv"/>
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides>
</start> }
append_if [have_spec ps2] config { append_if [have_spec ps2] config {
<start name="input_drv"> <start name="input_drv">
<binary name="ps2_drv"/> <binary name="ps2_drv"/>
@ -208,14 +200,13 @@ set boot_modules {
root-ginger.gz root-ginger.gz
} }
lappend_if [have_spec x86] boot_modules nic_drv lappend_if [have_spec x86] boot_modules nic_drv
lappend_if [have_spec x86] boot_modules atapi_drv lappend_if [have_spec x86] boot_modules atapi_drv
lappend_if [have_spec pci] boot_modules pci_drv lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec lan9118] boot_modules nic_drv lappend_if [have_spec lan9118] boot_modules nic_drv
lappend_if [have_spec pl180] boot_modules sd_card_drv lappend_if [have_spec pl180] boot_modules sd_card_drv
lappend_if [have_spec vesa] boot_modules vesa_drv
if {[have_spec x86]} { if {[have_spec x86]} {
set initrd_uri "http://genode.org/files/release-11.11/l4lx/root-ia32-ginger.gz" set initrd_uri "http://genode.org/files/release-11.11/l4lx/root-ia32-ginger.gz"

View File

@ -56,15 +56,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start> }
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start> } </start> }
@ -109,12 +103,11 @@ install_config $config
# Boot modules # Boot modules
# #
set boot_modules { core init timer uart_drv l4linux initrd.gz } set boot_modules { core init timer uart_drv l4linux initrd.gz }
lappend_if [have_spec pci] boot_modules pci_drv lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv lappend_if [have_spec framebuffer] boot_modules fb_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 nic_drv lappend_if [have_spec lan9118] boot_modules nic_drv
lappend_if [have_spec lan9118] boot_modules nic_drv
if {[have_spec x86]} { if {[have_spec x86]} {
set uri "http://genode.org/files/release-11.11/l4lx/initrd-ia32.gz" set uri "http://genode.org/files/release-11.11/l4lx/initrd-ia32.gz"

View File

@ -44,7 +44,6 @@ set config {
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="fb_drv" priority="-1"> <start name="fb_drv" priority="-1">
<binary name="omap4_fb_drv"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start> </start>
@ -111,7 +110,7 @@ set boot_modules {
part_blk part_blk
l4linux l4linux
initrd.gz initrd.gz
omap4_fb_drv fb_drv
sd_card_drv sd_card_drv
usb_drv usb_drv
} }

View File

@ -53,26 +53,11 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="fb_drv"> <start name="fb_drv">
<binary name="vesa_drv"/>
<resource name="RAM" quantum="1M"/>
<provides><service name="Framebuffer"/></provides>
</start> }
append_if [have_spec pl11x] config {
<start name="fb_drv">
<binary name="pl11x_drv"/>
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides>
</start> }
append_if [have_spec omap4] config {
<start name="fb_drv">
<binary name="omap4_fb_drv"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start> }
append_if [have_spec ps2] config { append_if [have_spec ps2] config {
<start name="input_drv"> <start name="input_drv">
@ -159,12 +144,10 @@ set boot_modules {
l4linux l4linux
initrd.gz initrd.gz
} }
lappend_if [have_spec pci] boot_modules pci_drv lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec usb] boot_modules usb_drv
lappend_if [have_spec omap4] boot_modules omap4_fb_drv
lappend_if [have_spec usb] boot_modules usb_drv
if {[have_spec x86]} { if {[have_spec x86]} {
set uri "https://github.com/downloads/skalk/genode/busybox-initrd-x86-20120618.gz" set uri "https://github.com/downloads/skalk/genode/busybox-initrd-x86-20120618.gz"

View File

@ -45,7 +45,6 @@ set config {
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="fb_drv"> <start name="fb_drv">
<binary name="omap4_fb_drv"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start> </start>
@ -149,7 +148,7 @@ set boot_modules {
timer timer
l4linux l4linux
initrd.gz initrd.gz
omap4_fb_drv fb_drv
usb_drv usb_drv
terminal terminal
terminal_log terminal_log

View File

@ -57,26 +57,11 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="fb_drv"> <start name="fb_drv">
<binary name="vesa_drv"/>
<resource name="RAM" quantum="1M"/>
<provides><service name="Framebuffer"/></provides>
</start> }
append_if [have_spec pl11x] config {
<start name="fb_drv">
<binary name="pl11x_drv"/>
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides>
</start> }
append_if [have_spec omap4] config {
<start name="fb_drv">
<binary name="omap4_fb_drv"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start> }
append_if [have_spec ps2] config { append_if [have_spec ps2] config {
<start name="input_drv"> <start name="input_drv">
@ -213,14 +198,12 @@ set boot_modules {
l4linux l4linux
initrd.gz initrd.gz
} }
lappend_if [have_spec pci] boot_modules pci_drv lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv lappend_if [have_spec framebuffer] boot_modules fb_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 nic_drv lappend_if [have_spec lan9118] boot_modules nic_drv
lappend_if [have_spec lan9118] boot_modules nic_drv lappend_if [have_spec usb] boot_modules usb_drv
lappend_if [have_spec omap4] boot_modules omap4_fb_drv
lappend_if [have_spec usb] boot_modules usb_drv
if {[have_spec x86]} { if {[have_spec x86]} {
set uri "https://github.com/downloads/skalk/genode/busybox-initrd-x86-20120618.gz" set uri "https://github.com/downloads/skalk/genode/busybox-initrd-x86-20120618.gz"

View File

@ -50,7 +50,6 @@ set config {
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="fb_drv"> <start name="fb_drv">
<binary name="omap4_fb_drv"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start> </start>
@ -239,7 +238,7 @@ set boot_modules {
terminal_log terminal_log
l4linux l4linux
initrd.gz initrd.gz
omap4_fb_drv fb_drv
sd_card_drv sd_card_drv
usb_drv usb_drv
ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so libc_ffat.lib.so ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so libc_ffat.lib.so

View File

@ -62,7 +62,7 @@
<memsection name="init" file="init" direct="true" /> <memsection name="init" file="init" direct="true" />
<memsection name="config" file="config" direct="true" /> <memsection name="config" file="config" direct="true" />
<memsection name="pci_drv" file="pci_drv" direct="true" /> <memsection name="pci_drv" file="pci_drv" direct="true" />
<memsection name="vesa_drv" file="vesa_drv" direct="true" /> <memsection name="fb_drv" file="fb_drv" direct="true" />
<memsection name="ps2_drv" file="ps2_drv" direct="true" /> <memsection name="ps2_drv" file="ps2_drv" direct="true" />
<memsection name="timer" file="timer" direct="true" /> <memsection name="timer" file="timer" direct="true" />
<memsection name="vmlinux" file="vmlinux" direct="true" /> <memsection name="vmlinux" file="vmlinux" direct="true" />

View File

@ -49,7 +49,7 @@ set config {
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start> </start>
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
<config><!--<preinit/>--></config> <config><!--<preinit/>--></config>
@ -92,7 +92,7 @@ set boot_modules { }
lappend boot_modules "core init" lappend boot_modules "core init"
# drivers # 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 # oklinux
lappend boot_modules "vmlinux initrd.gz tinycore.img" lappend boot_modules "vmlinux initrd.gz tinycore.img"

View File

@ -57,15 +57,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -137,11 +131,10 @@ set boot_modules {
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -78,15 +78,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -116,10 +110,9 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec pci] boot_modules pci_drv lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -84,20 +84,8 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec omap4] config {
<start name="omap4_fb_drv">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -190,13 +178,11 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv lappend_if [use_usb_input] boot_modules usb_drv
lappend_if [have_spec omap4] boot_modules omap4_fb_drv
lappend_if [use_usb_input] boot_modules usb_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -106,20 +106,8 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec omap4] config {
<start name="omap4_fb_drv">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -240,13 +228,11 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv lappend_if [have_spec usb] boot_modules usb_drv
lappend_if [have_spec omap4] boot_modules omap4_fb_drv
lappend_if [have_spec usb] boot_modules usb_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -100,15 +100,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -223,11 +217,10 @@ foreach pkg $noux_pkgs {
lappend boot_modules "$pkg.tar" } lappend boot_modules "$pkg.tar" }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -82,15 +82,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -181,11 +175,10 @@ foreach pkg $noux_pkgs {
lappend boot_modules "$pkg.tar" } lappend boot_modules "$pkg.tar" }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -84,15 +84,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -185,11 +179,10 @@ foreach pkg $noux_pkgs {
lappend boot_modules "$pkg.tar" } lappend boot_modules "$pkg.tar" }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -66,15 +66,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -162,11 +156,10 @@ foreach pkg $noux_pkgs {
lappend boot_modules "$pkg.tar" } lappend boot_modules "$pkg.tar" }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -74,15 +74,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start> } </start> }
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start> }
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start> } </start> }
@ -99,11 +93,8 @@ append config {
<route> } <route> }
append_if [have_spec ps2] config { append_if [have_spec ps2] config {
<service name="Input"><child name="ps2_drv"/></service> } <service name="Input"><child name="ps2_drv"/></service> }
append_if [have_spec vesa] config {
<service name="Framebuffer"><child name="vesa_drv"/> </service> }
append_if [have_spec pl11x] config {
<service name="Framebuffer"><child name="pl11x_drv"/> </service> }
append config { append config {
<service name="Framebuffer"><child name="fb_drv"/> </service> }
<any-service><parent/><any-child/></any-service> <any-service><parent/><any-child/></any-service>
</route> </route>
</start> </start>
@ -201,11 +192,10 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -109,15 +109,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -241,11 +235,10 @@ append boot_modules { genode.tar }
foreach pkg $platform_pkgs { append boot_modules "$pkg.tar" } foreach pkg $platform_pkgs { append boot_modules "$pkg.tar" }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -56,15 +56,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -130,11 +124,10 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -212,7 +212,7 @@ append config {
</route> </route>
</start> </start>
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
<route> <route>
@ -233,7 +233,7 @@ append config {
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<route> <route>
<service name="Timer"> <child name="timer"/></service> <service name="Timer"> <child name="timer"/></service>
<service name="Framebuffer"><child name="vesa_drv"/></service> <service name="Framebuffer"><child name="fb_drv"/></service>
<service name="Input"> <child name="ps2_drv"/></service> <service name="Input"> <child name="ps2_drv"/></service>
<any-service><parent/></any-service> <any-service><parent/></any-service>
</route> </route>
@ -259,7 +259,7 @@ install_config $config
# generic modules # generic modules
set boot_modules { set boot_modules {
core init core init
vesa_drv fb_drv
nitpicker nitpicker
liquid_fb liquid_fb
ps2_drv ps2_drv

View File

@ -53,15 +53,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -114,11 +108,10 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -53,15 +53,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -118,11 +112,10 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -56,15 +56,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -130,11 +124,10 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -55,15 +55,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -121,11 +115,10 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -65,15 +65,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -147,11 +141,10 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -53,15 +53,9 @@ append_if [have_spec pci] config {
<provides><service name="PCI"/></provides> <provides><service name="PCI"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -117,11 +111,10 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec vesa] boot_modules vesa_drv lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules

View File

@ -68,14 +68,8 @@ append_if [expr [have_spec pl180] || [have_spec omap4]] config {
<provides><service name="Block"/></provides> <provides><service name="Block"/></provides>
</start>} </start>}
append_if [have_spec vesa] config { append_if [have_spec framebuffer] config {
<start name="vesa_drv"> <start name="fb_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec omap4] config {
<start name="omap4_fb_drv">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Framebuffer"/></provides> <provides><service name="Framebuffer"/></provides>
</start>} </start>}
@ -87,12 +81,6 @@ append_if [expr ![have_spec ps2] && [have_spec usb]] config {
<config> <hid/> </config> <config> <hid/> </config>
</start>} </start>}
append_if [have_spec pl11x] config {
<start name="pl11x_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Framebuffer"/></provides>
</start>}
append_if [have_spec ps2] config { append_if [have_spec ps2] config {
<start name="ps2_drv"> <start name="ps2_drv">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
@ -159,15 +147,13 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl 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 pci_drv
lappend_if [have_spec pci] boot_modules atapi_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 ps2] boot_modules ps2_drv lappend_if [have_spec framebuffer] boot_modules fb_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 sd_card_drv lappend_if [have_spec omap4] boot_modules usb_drv
lappend_if [have_spec omap4] boot_modules omap4_fb_drv
lappend_if [have_spec omap4] boot_modules usb_drv
build_boot_image $boot_modules build_boot_image $boot_modules