Clean up ACPI:

- unify all iasl related rules into the toplevel Makefile
- build a filesystem standard for ACPI files and use it
- pass ACPI sources through cpp, so constants can be shared
  between C and ACPI more easily
- use cpp's #include instead of ACPI's Include() so cpp gets
  the whole picture

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5094 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 files changed, 24 insertions, 38 deletions

diff --git a/src/mainboard/technexion/tim5690/Makefile.inc b/src/mainboard/technexion/tim5690/Makefile.inc
index 25176c7133..277ab74e43 100644
--- a/src/mainboard/technexion/tim5690/Makefile.inc
+++ b/src/mainboard/technexion/tim5690/Makefile.inc
@@ -54,13 +54,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/technexion/tim5690/acpi/debug.asl b/src/mainboard/technexion/tim5690/acpi/debug.asl
index 5a5b1d6798..bd5c9659e5 100644
--- a/src/mainboard/technexion/tim5690/acpi/debug.asl
+++ b/src/mainboard/technexion/tim5690/acpi/debug.asl
@@ -27,7 +27,7 @@
 		0x00010001
 		)
 	{
-		Include ("debug.asl")
+		#include "debug.asl"
 	}
 */
 
diff --git a/src/mainboard/technexion/tim5690/acpi/globutil.asl b/src/mainboard/technexion/tim5690/acpi/globutil.asl
index 7265608a4b..7e7f4e1e16 100644
--- a/src/mainboard/technexion/tim5690/acpi/globutil.asl
+++ b/src/mainboard/technexion/tim5690/acpi/globutil.asl
@@ -19,7 +19,7 @@
 
 /*
 Scope(\_SB) {
-	Include ("globutil.asl")
+	#include "globutil.asl"
 }
 */
 
diff --git a/src/mainboard/technexion/tim5690/acpi/ide.asl b/src/mainboard/technexion/tim5690/acpi/ide.asl
index 75aa72c781..7d12fd25bd 100644
--- a/src/mainboard/technexion/tim5690/acpi/ide.asl
+++ b/src/mainboard/technexion/tim5690/acpi/ide.asl
@@ -22,7 +22,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(IDEC) {
 			Name(_ADR, 0x00140001)
-			Include ("ide.asl")
+			#include "ide.asl"
 		}
 	}
 }
diff --git a/src/mainboard/technexion/tim5690/acpi/routing.asl b/src/mainboard/technexion/tim5690/acpi/routing.asl
index 25e99f21c9..f9469da47b 100644
--- a/src/mainboard/technexion/tim5690/acpi/routing.asl
+++ b/src/mainboard/technexion/tim5690/acpi/routing.asl
@@ -21,7 +21,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("routing.asl")
+		#include "routing.asl"
 	}
 */
 
diff --git a/src/mainboard/technexion/tim5690/acpi/sata.asl b/src/mainboard/technexion/tim5690/acpi/sata.asl
index a67703d6ca..80e235da73 100644
--- a/src/mainboard/technexion/tim5690/acpi/sata.asl
+++ b/src/mainboard/technexion/tim5690/acpi/sata.asl
@@ -24,7 +24,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(SATA) {
 			Name(_ADR, 0x00120000)
-			Include ("sata.asl")
+			#include "sata.asl"
 		}
 	}
 }
diff --git a/src/mainboard/technexion/tim5690/acpi/usb.asl b/src/mainboard/technexion/tim5690/acpi/usb.asl
index 73cda9e810..6ea497e3cb 100644
--- a/src/mainboard/technexion/tim5690/acpi/usb.asl
+++ b/src/mainboard/technexion/tim5690/acpi/usb.asl
@@ -22,7 +22,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("usb.asl")
+		#include "usb.asl"
 	}
 */
 Method(UCOC, 0) {
diff --git a/src/mainboard/technexion/tim5690/acpi/dsdt.asl b/src/mainboard/technexion/tim5690/dsdt.asl
index 8bc793ae07..39ac7bdb83 100644
--- a/src/mainboard/technexion/tim5690/acpi/dsdt.asl
+++ b/src/mainboard/technexion/tim5690/dsdt.asl
@@ -27,7 +27,7 @@ DefinitionBlock (
 	0x00010001	/* OEM Revision */
 	)
 {	/* Start of ASL file */
-	/* Include ("debug.asl") */		/* Include global debug methods if needed */
+	/* #include "acpi/debug.asl" */		/* Include global debug methods if needed */
 
 	/* Data to be patched by the BIOS during POST */
 	/* FIXME the patching is not done yet! */
@@ -370,7 +370,7 @@ DefinitionBlock (
 		}
 	}
 
-	Include ("routing.asl")
+	#include "acpi/routing.asl"
 
 	Scope(\_SB) {
 
@@ -1119,11 +1119,11 @@ DefinitionBlock (
 
 	} 	/* End Scope GPE */
 
-	Include ("usb.asl")
+	#include "acpi/usb.asl"
 
 	/* South Bridge */
 	Scope(\_SB) { /* Start \_SB scope */
-		Include ("globutil.asl") /* global utility methods expected within the \_SB scope */
+		#include "acpi/globutil.asl" /* global utility methods expected within the \_SB scope */
 
 		/*  _SB.PCI0 */
 		/* Note: Only need HID on Primary Bus */
@@ -1222,7 +1222,7 @@ DefinitionBlock (
 			/* Describe the Southbridge devices */
 			Device(STCR) {
 				Name(_ADR, 0x00120000)
-				Include ("sata.asl")
+				#include "acpi/sata.asl"
 			} /* end STCR */
 
 			Device(UOH1) {
@@ -1262,7 +1262,7 @@ DefinitionBlock (
 			/* Primary (and only) IDE channel */
 			Device(IDEC) {
 				Name(_ADR, 0x00140001)
-				Include ("ide.asl")
+				#include "acpi/ide.asl"
 			} /* end IDEC */
 
 			Device(AZHD) {
diff --git a/src/mainboard/technexion/tim8690/Makefile.inc b/src/mainboard/technexion/tim8690/Makefile.inc
index 482dfff724..5b68cd3a2d 100644
--- a/src/mainboard/technexion/tim8690/Makefile.inc
+++ b/src/mainboard/technexion/tim8690/Makefile.inc
@@ -48,13 +48,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/technexion/tim8690/acpi/debug.asl b/src/mainboard/technexion/tim8690/acpi/debug.asl
index 5a5b1d6798..bd5c9659e5 100644
--- a/src/mainboard/technexion/tim8690/acpi/debug.asl
+++ b/src/mainboard/technexion/tim8690/acpi/debug.asl
@@ -27,7 +27,7 @@
 		0x00010001
 		)
 	{
-		Include ("debug.asl")
+		#include "debug.asl"
 	}
 */
 
diff --git a/src/mainboard/technexion/tim8690/acpi/globutil.asl b/src/mainboard/technexion/tim8690/acpi/globutil.asl
index 7265608a4b..7e7f4e1e16 100644
--- a/src/mainboard/technexion/tim8690/acpi/globutil.asl
+++ b/src/mainboard/technexion/tim8690/acpi/globutil.asl
@@ -19,7 +19,7 @@
 
 /*
 Scope(\_SB) {
-	Include ("globutil.asl")
+	#include "globutil.asl"
 }
 */
 
diff --git a/src/mainboard/technexion/tim8690/acpi/ide.asl b/src/mainboard/technexion/tim8690/acpi/ide.asl
index 75aa72c781..7d12fd25bd 100644
--- a/src/mainboard/technexion/tim8690/acpi/ide.asl
+++ b/src/mainboard/technexion/tim8690/acpi/ide.asl
@@ -22,7 +22,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(IDEC) {
 			Name(_ADR, 0x00140001)
-			Include ("ide.asl")
+			#include "ide.asl"
 		}
 	}
 }
diff --git a/src/mainboard/technexion/tim8690/acpi/routing.asl b/src/mainboard/technexion/tim8690/acpi/routing.asl
index 25e99f21c9..f9469da47b 100644
--- a/src/mainboard/technexion/tim8690/acpi/routing.asl
+++ b/src/mainboard/technexion/tim8690/acpi/routing.asl
@@ -21,7 +21,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("routing.asl")
+		#include "routing.asl"
 	}
 */
 
diff --git a/src/mainboard/technexion/tim8690/acpi/sata.asl b/src/mainboard/technexion/tim8690/acpi/sata.asl
index a67703d6ca..80e235da73 100644
--- a/src/mainboard/technexion/tim8690/acpi/sata.asl
+++ b/src/mainboard/technexion/tim8690/acpi/sata.asl
@@ -24,7 +24,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(SATA) {
 			Name(_ADR, 0x00120000)
-			Include ("sata.asl")
+			#include "sata.asl"
 		}
 	}
 }
diff --git a/src/mainboard/technexion/tim8690/acpi/usb.asl b/src/mainboard/technexion/tim8690/acpi/usb.asl
index 3fc9fc58fe..5b802bc902 100644
--- a/src/mainboard/technexion/tim8690/acpi/usb.asl
+++ b/src/mainboard/technexion/tim8690/acpi/usb.asl
@@ -22,7 +22,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("usb.asl")
+		#include "usb.asl"
 	}
 */
 Method(UCOC, 0) {
diff --git a/src/mainboard/technexion/tim8690/acpi/dsdt.asl b/src/mainboard/technexion/tim8690/dsdt.asl
index 001354861c..05c61f0d8b 100644
--- a/src/mainboard/technexion/tim8690/acpi/dsdt.asl
+++ b/src/mainboard/technexion/tim8690/dsdt.asl
@@ -27,7 +27,7 @@ DefinitionBlock (
 	0x00010001	/* OEM Revision */
 	)
 {	/* Start of ASL file */
-	/* Include ("debug.asl") */		/* Include global debug methods if needed */
+	/* #include "acpi/debug.asl" */		/* Include global debug methods if needed */
 
 	/* Data to be patched by the BIOS during POST */
 	/* FIXME the patching is not done yet! */
@@ -370,7 +370,7 @@ DefinitionBlock (
 		}
 	}
 
-	Include ("routing.asl")
+	#include "acpi/routing.asl"
 
 	Scope(\_SB) {
 
@@ -1119,11 +1119,11 @@ DefinitionBlock (
 
 	} 	/* End Scope GPE */
 
-	Include ("usb.asl")
+	#include "acpi/usb.asl"
 
 	/* South Bridge */
 	Scope(\_SB) { /* Start \_SB scope */
-		Include ("globutil.asl") /* global utility methods expected within the \_SB scope */
+		#include "acpi/globutil.asl" /* global utility methods expected within the \_SB scope */
 
 		/*  _SB.PCI0 */
 		/* Note: Only need HID on Primary Bus */
@@ -1222,7 +1222,7 @@ DefinitionBlock (
 			/* Describe the Southbridge devices */
 			Device(STCR) {
 				Name(_ADR, 0x00120000)
-				Include ("sata.asl")
+				#include "acpi/sata.asl"
 			} /* end STCR */
 
 			Device(UOH1) {
@@ -1262,7 +1262,7 @@ DefinitionBlock (
 			/* Primary (and only) IDE channel */
 			Device(IDEC) {
 				Name(_ADR, 0x00140001)
-				Include ("ide.asl")
+				#include "acpi/ide.asl"
 			} /* end IDEC */
 
 			Device(AZHD) {