run: adjust autopilot run scripts to pci changes

Issue #1486
This commit is contained in:
Alexander Boettcher 2015-04-24 16:10:04 +02:00 committed by Christian Helmuth
parent 18b36fb339
commit df50d1b29d
11 changed files with 124 additions and 14 deletions

View File

@ -63,6 +63,14 @@ append_if [have_spec acpi] config {
<service name="PCI"/>
<service name="IRQ" />
</provides>
<config>
<policy label="acpi_drv">
<pci class="ALL"/>
</policy>
<policy label="usb_drv">
<pci class="USB"/>
</policy>
</config>
<route>
<service name="PCI"> <any-child /> </service>
<any-service> <parent/> <any-child /> </any-service>

View File

@ -122,6 +122,14 @@ append_if [have_spec acpi] config {
<service name="PCI"> <any-child /> </service>
<any-service> <parent/> <any-child /> </any-service>
</route>
<config>
<policy label="acpi_drv">
<pci class="ALL"/>
</policy>
<policy label="wifi_drv">
<pci class="WIFI"/>
</policy>
</config>
</start>}
append_if [have_spec platform_arndale] config {

View File

@ -99,6 +99,14 @@ append_if [have_spec acpi] config {
<service name="PCI"/>
<service name="IRQ" />
</provides>
<config>
<policy label="acpi_drv">
<pci class="ALL"/>
</policy>
<policy label="ahci">
<pci class="AHCI"/>
</policy>
</config>
<route>
<service name="PCI"> <any-child /> </service>
<any-service> <parent/> <any-child /> </any-service>
@ -109,6 +117,11 @@ append_if [expr ![have_spec acpi] && [have_spec pci]] config {
<start name="pci_drv">
<resource name="RAM" quantum="5M" constrain_phys="yes"/>
<provides><service name="PCI"/></provides>
<config>
<policy label="ahci">
<pci class="AHCI"/>
</policy>
</config>
</start>}
append_if $use_ahci config {

View File

@ -132,12 +132,28 @@ append_if [have_spec acpi] config {
<service name="PCI"> <any-child /> </service>
<any-service> <parent/> <any-child /> </any-service>
</route>
<config>
<policy label="acpi_drv">
<pci class="ALL"/>
</policy>
<policy label="nic_drv">
<pci class="ETHERNET"/>
</policy>
</config>
</start>}
append_if [expr ![have_spec acpi] && [have_spec pci]] config {
<start name="pci_drv">
<resource name="RAM" quantum="3M" constrain_phys="yes"/>
<provides> <service name="PCI"/> </provides>
<config>
<policy label="acpi_drv">
<pci class="ALL"/>
</policy>
<policy label="nic_drv">
<pci class="ETHERNET"/>
</policy>
</config>
</start>}
append config {

View File

@ -63,6 +63,11 @@ append_if [have_spec pci] config {
<start name="pci_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="PCI"/></provides>
<config>
<policy label="ps2_drv"> <device name="PS2"/> </policy>
<policy label="usb_drv"> <pci class="USB"/> </policy>
<policy label="fb_drv"> <pci class="VGA"/> </policy>
</config>
</start>}
append_if [have_spec framebuffer] config {

View File

@ -69,9 +69,14 @@ append_if [have_spec acpi] config {
<service name="PCI"/>
<service name="IRQ" />
</provides>
<config>
<policy label="acpi_drv"> <pci class="ALL"/> </policy>
<policy label="nic_drv"> <pci class="ETHERNET"/> </policy>
<policy label="fb_drv"> <pci class="VGA"/> </policy>
<policy label="ps2_drv"> <device name="PS2"/> </policy>
</config>
<route>
<service name="PCI"> <any-child /> </service>
<any-service> <parent/> <any-child /> </any-service>
<any-service> <parent/> </any-service>
</route>
</start> }
@ -79,6 +84,12 @@ append_if [expr ![have_spec acpi] && [have_spec pci]] config {
<start name="pci_drv">
<resource name="RAM" quantum="3M" constrain_phys="yes"/>
<provides> <service name="PCI"/> </provides>
<config>
<policy label="nic_drv"> <pci class="ETHERNET"/> </policy>
<policy label="fb_drv"> <pci class="VGA"/> </policy>
<policy label="ps2_drv"> <device name="PS2"/> </policy>
</config>
<route>
</start> }
append_if [have_spec framebuffer] config {

View File

@ -232,9 +232,13 @@ append_if [have_spec acpi] config {
<service name="PCI"/>
<service name="IRQ" />
</provides>
<config>
<policy label="acpi_drv"> <pci class="ALL"/> </policy>
<policy label="nic_drv"> <pci class="ETHERNET"/> </policy>
<policy label="wifi_drv"> <pci class="WIFI"/> </policy>
</config>
<route>
<service name="PCI"> <any-child /> </service>
<any-service> <parent/> <any-child /> </any-service>
<any-service> <parent/> </any-service>
</route>
</start>}
@ -242,6 +246,10 @@ append_if [expr ![have_spec acpi] && [have_spec pci]] config {
<start name="pci_drv">
<resource name="RAM" quantum="3M" constrain_phys="yes"/>
<provides> <service name="PCI"/> </provides>
<config>
<policy label="nic_drv"> <pci class="ETHERNET"/> </policy>
<policy label="wifi_drv"> <pci class="WIFI"/> </policy>
</config>
</start> }
append config {

View File

@ -143,9 +143,16 @@ append_if [have_spec acpi] config {
<service name="PCI"/>
<service name="IRQ" />
</provides>
<config>
<policy label="acpi_drv">
<pci class="ALL"/>
</policy>
<policy label="nic_drv">
<pci class="ETHERNET"/>
</policy>
</config>
<route>
<service name="PCI"> <any-child /> </service>
<any-service> <parent/> <any-child /> </any-service>
<any-service> <parent/> </any-service>
</route>
</start>}
@ -153,6 +160,11 @@ append_if [expr ![have_spec acpi] && [have_spec pci]] config {
<start name="pci_drv">
<resource name="RAM" quantum="2M" constrain_phys="yes"/>
<provides> <service name="PCI"/> </provides>
<config>
<policy label="nic_drv">
<pci class="ETHERNET"/>
</policy>
</config>
</start> }
append config {

View File

@ -140,6 +140,12 @@ append_if [have_spec acpi] config {
<service name="PCI"/>
<service name="IRQ" />
</provides>
<config>
<policy label="acpi_drv"> <pci class="ALL"/> </policy>
<policy label="ps2_drv"> <device name="PS2"/> </policy>
<policy label="usb_drv"> <pci class="USB"/> </policy>
<policy label="fb_drv"> <pci class="VGA"/> </policy>
</config>
<route>
<service name="PCI"> <any-child /> </service>
<any-service> <parent/> <any-child /> </any-service>
@ -156,6 +162,11 @@ append_if [expr ![have_spec acpi] && [have_spec pci]] config {
<start name="pci_drv">
<resource name="RAM" quantum="2M" constrain_phys="yes"/>
<provides> <service name="PCI"/> </provides>
<config>
<policy label="ps2_drv"> <device name="PS2"/> </policy>
<policy label="usb_drv"> <pci class="USB"/> </policy>
<policy label="fb_drv"> <pci class="VGA"/> </policy>
</config>
</start> }
append_if [have_spec ps2] config {

View File

@ -14,6 +14,8 @@ if {![have_spec nova]} {
exit 0
}
assert_spec acpi
set build_components {
core init
drivers/timer
@ -161,7 +163,7 @@ append_if [expr !$use_usb] config {
<start name="ps2_drv" priority="-1">
<resource name="RAM" quantum="3M"/>
<provides><service name="Input"/></provides>
<route> <any-service><parent/></any-service> </route>
<route> <any-service><parent/> <any-child/> </any-service> </route>
</start> }
append_if $use_block_sata config {
@ -194,19 +196,20 @@ append_if [have_spec acpi] config {
<service name="PCI"/>
<service name="IRQ" />
</provides>
<config>
<policy label="acpi_drv"> <pci class="ALL"/> </policy>
<policy label="ahci"> <pci class="AHCI"/> </policy>
<policy label="nic_drv"> <pci class="ETHERNET"/> </policy>
<policy label="ps2_drv"> <device name="PS2"/> </policy>
<policy label="usb_drv"> <pci class="USB"/> </policy>
<policy label="fb_drv"> <pci class="VGA"/> </policy>
</config>
<route>
<service name="PCI"> <any-child /> </service>
<any-service> <parent/> <any-child /> </any-service>
</route>
</start>}
append_if [expr ![have_spec acpi] && [have_spec pci]] config {
<start name="pci_drv" priority="-1">
<resource name="RAM" quantum="3M" constrain_phys="yes"/>
<provides><service name="PCI"/></provides>
<route> <any-service><parent/></any-service> </route>
</start>
}
append_if $use_nic_session config {
<start name="nic_drv" priority="-2">

View File

@ -99,6 +99,14 @@ append_if [have_spec acpi] config {
<service name="PCI"/>
<service name="IRQ" />
</provides>
<config>
<policy label="acpi_drv"> <pci class="ALL"/> </policy>
<policy label="ahci"> <pci class="AHCI"/> </policy>
<policy label="nic_drv"> <pci class="ETHERNET"/> </policy>
<policy label="ps2_drv"> <device name="PS2"/> </policy>
<policy label="usb_drv"> <pci class="USB"/> </policy>
<policy label="fb_drv"> <pci class="VGA"/> </policy>
</config>
<route>
<service name="PCI"> <any-child /> </service>
<any-service> <parent/> <any-child /> </any-service>
@ -109,6 +117,13 @@ append_if [expr ![have_spec acpi] && [have_spec pci]] config {
<start name="pci_drv" priority="-1">
<resource name="RAM" quantum="2M" constrain_phys="yes"/>
<provides> <service name="PCI"/> </provides>
<config>
<policy label="ahci"> <pci class="AHCI"/> </policy>
<policy label="nic_drv"> <pci class="ETHERNET"/> </policy>
<policy label="ps2_drv"> <device name="PS2"/> </policy>
<policy label="usb_drv"> <pci class="USB"/> </policy>
<policy label="fb_drv"> <pci class="VGA"/> </policy>
</config>
</start>}
append_if [expr $use_ps2] config {