Add platform_drv to relevant run-scripts (fix #778)

This commit is contained in:
Stefan Kalkowski 2013-06-25 14:19:55 +02:00
parent ae49f6216d
commit e23f24505b
12 changed files with 133 additions and 50 deletions

View File

@ -9,9 +9,10 @@ set build_components {
test/input
}
lappend_if [have_spec acpi] build_components drivers/acpi
lappend_if [have_spec pci] build_components drivers/pci
lappend_if [have_spec pci] build_components drivers/pci/device_pd
lappend_if [have_spec acpi] build_components drivers/acpi
lappend_if [have_spec pci] build_components drivers/pci
lappend_if [have_spec pci] build_components drivers/pci/device_pd
lappend_if [have_spec platform_arndale] build_components drivers/platform
build $build_components
@ -40,6 +41,12 @@ append config {
<any-service> <parent/> <any-child/> </any-service>
</default-route>}
append_if [have_spec platform_arndale] config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Regulator"/></provides>
</start>}
append_if [have_spec acpi] config {
<start name="acpi">
<resource name="RAM" quantum="8M"/>
@ -88,9 +95,10 @@ set boot_modules {
core init timer usb_drv test-input
}
lappend_if [have_spec acpi] boot_modules acpi_drv
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec nova] boot_modules pci_device_pd
lappend_if [have_spec acpi] boot_modules acpi_drv
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec nova] boot_modules pci_device_pd
lappend_if [have_spec platform_arndale] boot_modules platform_drv
build_boot_image $boot_modules

View File

@ -17,8 +17,9 @@ build {
test/lwip/http_srv
}
lappend_if [have_spec acpi] build_components drivers/acpi
lappend_if [have_spec pci] build_components drivers/pci/device_pd
lappend_if [have_spec acpi] build_components drivers/acpi
lappend_if [have_spec pci] build_components drivers/pci/device_pd
lappend_if [have_spec platform_arndale] build_components drivers/platform
create_boot_directory
@ -49,14 +50,12 @@ set config {
<provides> <service name="Timer"/> </provides>
</start>
<start name="usb_drv">
<resource name="RAM" quantum="4M"/>
<resource name="RAM" quantum="6M"/>
<provides>
<service name="Nic"/>
<service name="Input"/>
</provides>
<config ehci="yes" xhci="yes">
<config ehci="yes">
<nic mac="2e:60:90:0c:4e:01" />
<hid/>
</config>
</start>
<start name="test-lwip_httpsrv">
@ -77,6 +76,12 @@ append_if [have_spec acpi] config {
</route>
</start>}
append_if [have_spec platform_arndale] config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Regulator"/></provides>
</start>}
append_if [expr ![have_spec acpi] && [have_spec pci]] config {
<start name="pci_drv">
<resource name="RAM" quantum="3M"/>
@ -100,9 +105,10 @@ set boot_modules {
ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so test-lwip_httpsrv
}
lappend_if [have_spec acpi] boot_modules acpi_drv
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec nova] boot_modules pci_device_pd
lappend_if [have_spec acpi] boot_modules acpi_drv
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec nova] boot_modules pci_device_pd
lappend_if [have_spec platform_arndale] boot_modules platform_drv
build_boot_image $boot_modules

View File

@ -15,9 +15,10 @@ build {
test/block
}
lappend_if [have_spec acpi] build_components drivers/acpi
lappend_if [have_spec pci] build_components drivers/pci
lappend_if [have_spec pci] build_components drivers/pci/device_pd
lappend_if [have_spec acpi] build_components drivers/acpi
lappend_if [have_spec pci] build_components drivers/pci
lappend_if [have_spec pci] build_components drivers/pci/device_pd
lappend_if [have_spec platform_arndale] build_components drivers/platform
create_boot_directory
@ -64,6 +65,12 @@ append_if [expr ![have_spec acpi] && [have_spec pci]] config {
<provides><service name="PCI"/></provides>
</start>}
append_if [have_spec platform_arndale] config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Regulator"/></provides>
</start>}
append config {
<start name="timer">
<resource name="RAM" quantum="1M"/>
@ -91,9 +98,10 @@ set boot_modules {
core init timer usb_drv test-block
}
lappend_if [have_spec acpi] boot_modules acpi_drv
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec nova] boot_modules pci_device_pd
lappend_if [have_spec acpi] boot_modules acpi_drv
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec nova] boot_modules pci_device_pd
lappend_if [have_spec platform_arndale] boot_modules platform_drv
build_boot_image $boot_modules

View File

@ -37,9 +37,10 @@ set build_components {
set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5]]
set use_nic_driver [expr !$use_usb_driver]
lappend_if $use_usb_driver build_components drivers/usb
lappend_if [have_spec acpi] build_components drivers/acpi
lappend_if [have_spec pci] build_components drivers/pci/device_pd
lappend_if $use_usb_driver build_components drivers/usb
lappend_if [have_spec acpi] build_components drivers/acpi
lappend_if [have_spec pci] build_components drivers/pci/device_pd
lappend_if [have_spec platform_arndale] build_components drivers/platform
build $build_components
@ -75,6 +76,13 @@ set config {
<resource name="RAM" quantum="3M"/>
</start> }
append_if [have_spec platform_arndale] config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Regulator"/></provides>
</start>}
append_if $use_usb_driver config {
<start name="usb_drv">
<resource name="RAM" quantum="12M"/>
@ -129,11 +137,12 @@ set boot_modules {
}
# platform-specific modules
lappend_if [have_spec acpi] boot_modules acpi_drv
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if $use_usb_driver boot_modules usb_drv
lappend_if $use_nic_driver boot_modules nic_drv
lappend_if [have_spec nova] boot_modules pci_device_pd
lappend_if [have_spec acpi] boot_modules acpi_drv
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if $use_usb_driver boot_modules usb_drv
lappend_if $use_nic_driver boot_modules nic_drv
lappend_if [have_spec nova] boot_modules pci_device_pd
lappend_if [have_spec platform_arndale] boot_modules platform_drv
build_boot_image $boot_modules

View File

@ -15,6 +15,7 @@ set build_components {
}
lappend_if [expr [have_spec omap4] || [have_spec exynos5]] build_components drivers/usb
lappend_if [have_spec platform_arndale] build_components drivers/platform
build $build_components
@ -47,6 +48,12 @@ set config {
<provides> <service name="Timer"/> </provides>
</start> }
append_if [have_spec platform_arndale] config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Regulator"/></provides>
</start>}
append_if [expr [have_spec omap4] || [have_spec exynos5]] config {
<start name="usb_drv" priority="-1">
<resource name="RAM" quantum="12M"/>
@ -118,9 +125,10 @@ set boot_modules {
}
# platform-specific modules
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec omap4] boot_modules usb_drv
lappend_if [expr ![have_spec omap4]] boot_modules nic_drv
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [expr [have_spec omap4] || [have_spec exynos5]] boot_modules usb_drv
lappend_if [expr ![have_spec omap4] && ![have_spec exynos5]] boot_modules nic_drv
lappend_if [have_spec platform_arndale] boot_modules platform_drv
build_boot_image $boot_modules

View File

@ -15,6 +15,7 @@ set build_components {
}
lappend_if [expr [have_spec omap4] || [have_spec exynos5]] build_components drivers/usb
lappend_if [have_spec platform_arndale] build_components drivers/platform
build $build_components
@ -53,6 +54,12 @@ set config {
</config>
</start> }
append_if [have_spec platform_arndale] config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Regulator"/></provides>
</start>}
append_if [expr [have_spec omap4] || [have_spec exynos5]] config {
<start name="usb_drv" priority="-1">
<resource name="RAM" quantum="12M"/>
@ -94,9 +101,10 @@ set boot_modules {
}
# platform-specific modules
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [expr [have_spec omap4] || [have_spec exynos5]] boot_modules usb_drv
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [expr [have_spec omap4] || [have_spec exynos5]] boot_modules usb_drv
lappend_if [expr ![have_spec omap4] && ![have_spec exynos5]] boot_modules nic_drv
lappend_if [have_spec platform_arndale] boot_modules platform_drv
build_boot_image $boot_modules

View File

@ -1,3 +1,5 @@
assert_spec foc_arndale
#
# Build
#

View File

@ -5,11 +5,11 @@
# generic components
set build_components {
core init
drivers/platform
drivers/timer
drivers/sd_card
test/block
}
lappend_if [have_spec platform_arndale] build_components drivers/platform
build $build_components
create_boot_directory
@ -35,12 +35,15 @@ set config {
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
</default-route> }
append_if [have_spec platform_arndale] config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Regulator"/></provides>
</start>
</start>}
append config {
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
@ -52,8 +55,7 @@ set config {
<start name="test-block">
<resource name="RAM" quantum="1M" />
</start>
</config>
}
</config> }
install_config $config
@ -66,10 +68,10 @@ install_config $config
set boot_modules {
core init
timer
platform_drv
sd_card_drv
test-block
}
lappend_if [have_spec platform_arndale] boot_modules platform_drv
set disk_image "bin/sd_card.img"

View File

@ -7,10 +7,11 @@ if {[have_spec foc] == 0} {
exit 0
}
set use_usb_drv [expr [have_spec omap4] || [have_spec exynos5]]
set use_nic_drv [expr !$use_usb_drv]
set use_atapi_drv [have_spec x86]
set use_sd_card_drv [expr [have_spec omap4] || [have_spec exynos5] || [have_spec pl180]]
set use_platform_drv [expr [have_spec platform_arndale] || [have_spec platform_imx53]]
set use_usb_drv [expr [have_spec omap4] || [have_spec exynos5]]
set use_nic_drv [expr !$use_usb_drv]
set use_atapi_drv [have_spec x86]
set use_sd_card_drv [expr [have_spec omap4] || [have_spec exynos5] || [have_spec pl180]]
# generic components
set build_components {
@ -32,6 +33,7 @@ lappend_if $use_usb_drv build_components drivers/usb
lappend_if $use_nic_drv build_components drivers/nic
lappend_if $use_atapi_drv build_components drivers/atapi
lappend_if $use_sd_card_drv build_components drivers/sd_card
lappend_if $use_platform_drv build_components drivers/platform
build $build_components
create_boot_directory
@ -160,6 +162,14 @@ append_if [expr ![have_spec acpi] && [have_spec pci]] config {
<provides><service name="PCI"/></provides>
</start>}
append_if $use_platform_drv config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides>
<service name="Regulator"/>
</provides>
</start>}
append_if $use_usb_drv config {
<start name="usb_drv">
<resource name="RAM" quantum="12M"/>
@ -238,6 +248,7 @@ lappend_if $use_usb_drv boot_modules usb_drv
lappend_if $use_nic_drv boot_modules nic_drv
lappend_if $use_atapi_drv boot_modules atapi_drv
lappend_if $use_sd_card_drv boot_modules sd_card_drv
lappend_if $use_platform_drv boot_modules platform_drv
if {[have_spec x86]} {
set initrd_uri "http://genode.org/files/release-11.11/l4lx/root-ia32-ginger.gz"

View File

@ -11,14 +11,16 @@ set build_components {
drivers/framebuffer
l4linux }
set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5]]
set use_nic_driver [expr !$use_usb_driver && [expr [have_spec lan9118] || [have_spec x86]]]
set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5]]
set use_nic_driver [expr !$use_usb_driver && [expr [have_spec lan9118] || [have_spec x86]]]
set use_platform_drv [expr [have_spec platform_arndale] || [have_spec platform_imx53]]
lappend_if $use_usb_driver build_components drivers/usb
lappend_if $use_nic_driver build_components drivers/nic
lappend_if [have_spec pci] build_components drivers/pci
lappend_if [have_spec acpi] build_components drivers/acpi
lappend_if [have_spec ps2] build_components drivers/input/ps2
lappend_if $use_platform_drv build_components drivers/platform
build $build_components
create_boot_directory
@ -89,6 +91,14 @@ append_if [have_spec ps2] config {
<provides><service name="Input"/></provides>
</start> }
append_if $use_platform_drv config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides>
<service name="Regulator"/>
</provides>
</start>}
append_if $use_usb_driver config {
<start name="usb_drv">
<resource name="RAM" quantum="12M"/>
@ -134,6 +144,7 @@ lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec framebuffer] boot_modules fb_drv
lappend_if $use_nic_driver boot_modules nic_drv
lappend_if $use_usb_driver boot_modules usb_drv
lappend_if $use_platform_drv boot_modules platform_drv
if {[have_spec x86]} {
set uri "http://genode.org/files/release-11.11/l4lx/initrd-ia32.gz"

View File

@ -1,5 +1,4 @@
assert_spec foc
assert_spec arm
assert_spec foc_arndale
set use_nic_bridge 0

View File

@ -12,14 +12,16 @@ set build_components {
noux-pkg/netcat
}
set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5]]
set use_nic_driver [expr !$use_usb_driver]
set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5]]
set use_nic_driver [expr !$use_usb_driver]
set use_platform_drv [expr [have_spec platform_arndale] || [have_spec platform_imx53]]
lappend_if $use_usb_driver build_components drivers/usb
lappend_if $use_nic_driver build_components drivers/nic
lappend_if [have_spec acpi] build_components drivers/acpi
lappend_if [have_spec pci] build_components drivers/pci/device_pd
lappend_if [is_qemu_available] build_components drivers/uart
lappend_if $use_platform_drv build_components drivers/platform
build $build_components
@ -102,6 +104,14 @@ append_if $use_nic_driver config {
<provides> <service name="Nic"/> </provides>
</start>}
append_if $use_platform_drv config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides>
<service name="Regulator"/>
</provides>
</start>}
append_if $use_usb_driver config {
<start name="usb_drv">
<resource name="RAM" quantum="12M"/>
@ -177,6 +187,7 @@ lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec acpi] boot_modules acpi_drv
lappend_if [have_spec nova] boot_modules pci_device_pd
lappend_if [is_qemu_available] boot_modules uart_drv
lappend_if $use_platform_drv boot_modules platform_drv
build_boot_image $boot_modules