From 398fa76cdbb7c6f7d8dcdd43dc31dab163c1f34a Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Wed, 27 Feb 2013 17:27:33 +0100
Subject: [PATCH] vancouver: adjust run script to use acpi+iommu

---
 ports/run/vancouver.run | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/ports/run/vancouver.run b/ports/run/vancouver.run
index 1c54e4aba..c885a9dd7 100644
--- a/ports/run/vancouver.run
+++ b/ports/run/vancouver.run
@@ -30,11 +30,13 @@ set build_components {
 	server/nic_bridge
 	drivers/pci
 	drivers/input
-	drivers/usb
 	app/launchpad
 	server/nitlog
 }
 
+lappend_if [have_spec acpi]  build_components drivers/acpi
+lappend_if [have_spec pci]   build_components drivers/pci/device_pd
+
 build $build_components
 
 # write vancouver vm config file
@@ -170,14 +172,31 @@ append config {
 	<start name="rtc_drv">
 		<resource name="RAM" quantum="1M"/>
 		<provides><service name="Rtc"/></provides>
-	</start>
+	</start>}
 
+append_if [have_spec acpi] config {
+	<start name="acpi">
+		<resource name="RAM" quantum="5M"/>
+		<binary name="acpi_drv"/>
+		<provides>
+			<service name="PCI"/>
+			<service name="IRQ" />
+		</provides>
+		<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">
 		<resource name="RAM" quantum="3M"/>
 		<provides><service name="PCI"/></provides>
 		<route> <any-service><parent/></any-service> </route>
 	</start>
+}
 
+append config {
 	<start name="nic_drv">
 		<resource name="RAM" quantum="3M"/>
 		<provides><service name="Nic"/></provides>
@@ -247,7 +266,6 @@ set boot_modules {
 	pci_drv
 	nic_drv
 	nic_bridge
-	usb_drv
 	timer
 	rtc_drv
 	vancouver
@@ -257,6 +275,9 @@ set boot_modules {
 	vm_linux.cfg
 }
 
+lappend_if [have_spec acpi]          boot_modules acpi_drv
+lappend_if [have_spec nova]          boot_modules pci_device_pd
+
 set guest_os_binaries { munich bzImage ramdisk }
 
 set guest_os_binary_missing 0