21 files changed, 35 insertions, 62 deletions
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
index 619e53a1cc..e9b4fcbc5a 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
@@ -51,33 +51,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/dsdt -tc $<
-	mv $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
-	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/pci2 -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' $(obj)/mainboard/$(MAINBOARDDIR)/pci2.hex
-	mv $(obj)/mainboard/$(MAINBOARDDIR)/pci2.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl
-	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/pci3 -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' $(obj)/mainboard/$(MAINBOARDDIR)/pci3.hex
-	mv $(obj)/mainboard/$(MAINBOARDDIR)/pci3.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl
-	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/pci4 -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' $(obj)/mainboard/$(MAINBOARDDIR)/pci4.hex
-	mv $(obj)/mainboard/$(MAINBOARDDIR)/pci4.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt5.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci5.asl
-	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/pci5 -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_ssdt5/g' $(obj)/mainboard/$(MAINBOARDDIR)/pci5.hex
-	mv $(obj)/mainboard/$(MAINBOARDDIR)/pci5.hex $@
-
 $(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/amd/serengeti_cheetah_fam10/dx/amd8111.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl
index 054b971204..db786184c4 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl
@@ -97,9 +97,9 @@
 		}
 	}
 
-	Include ("amd8111_pic.asl")
+	#include "amd8111_pic.asl"
 
-	Include ("amd8111_isa.asl")
+	#include "amd8111_isa.asl"
 
 	Device (TP2P)
 	{
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111_isa.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl
index f679baee1c..1a91c901b7 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111_isa.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl
@@ -186,7 +186,7 @@
 				IRQNoFlags () {1}
 			})
 		}
-		Include ("superio.asl")
+		#include "superio.asl"
 
 	}
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111_pic.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_pic.asl
index 585f195264..585f195264 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111_pic.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_pic.asl
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8131_2.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8131_2.asl
index d810726e58..d810726e58 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8131_2.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8131_2.asl
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8132.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132.asl
index 2ac06f8976..2ac06f8976 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8132.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132.asl
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8132_2.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132_2.asl
index e944e14a2e..e944e14a2e 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8132_2.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132_2.asl
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8151.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8151.asl
index fd070feda4..fd070feda4 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8151.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8151.asl
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/htx_no_ioapic.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/htx_no_ioapic.asl
index 9115caa767..9115caa767 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/htx_no_ioapic.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/htx_no_ioapic.asl
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl
index 78433b1312..9c7919314d 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5_hc.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl
@@ -16,5 +16,5 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 //
-
-	Include ("htx_no_ioapic.asl")
+	#include "amd8111.asl" //real SB at first
+	#include "amd8132.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl
index 5ada493e59..043e3b24e8 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2_hc.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl
@@ -17,4 +17,4 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 //
 
-	Include ("amd8132_2.asl")
+	#include "amd8132_2.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl
index ccd545cefa..afb1530368 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3_hc.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl
@@ -17,4 +17,4 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 //
 
-	Include ("amd8151.asl")
+	#include "amd8151.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl
index 3f259e5cf2..60e9988a59 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4_hc.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl
@@ -17,4 +17,4 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 //
 
-	Include ("amd8131_2.asl")
+	#include "amd8131_2.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl
new file mode 100644
index 0000000000..b881868021
--- /dev/null
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl
@@ -0,0 +1,20 @@
+//
+// This file is part of the coreboot project.
+//
+// Copyright (C) 2007 Advanced Micro Devices, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+//
+
+	#include "htx_no_ioapic.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/superio.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl
index dab88649c8..da39b88582 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/superio.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl
@@ -17,4 +17,4 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 //
 
-//	Include ("w83627hf.asl")
+//	#include "w83627hf.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/dsdt_lb.dsl b/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl
index 78a7fb111d..7676ddd576 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/dsdt_lb.dsl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl
@@ -119,7 +119,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 				Return (Local3)
 			}
 
-			Include ("pci0_hc.asl")
+			#include "acpi/pci0_hc.asl"
 
 		}
 		Device (PCI1)
@@ -238,5 +238,5 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 		Z00A, 8
 	}
 
-	Include ("../../../../../src/northbridge/amd/amdfam10/amdfam10_util.asl")
+	#include "northbridge/amd/amdfam10/amdfam10_util.asl"
 }
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci0_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci0_hc.asl
deleted file mode 100644
index 2df9035633..0000000000
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci0_hc.asl
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// This file is part of the coreboot project.
-//
-// Copyright (C) 2007 Advanced Micro Devices, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-//
-	Include ("amd8111.asl") //real SB at first
-	Include ("amd8132.asl")
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl
index 9e8345e901..bf9708e0cb 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl
@@ -75,7 +75,7 @@ DefinitionBlock ("SSDT2.aml", "SSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 			Return (Local3)
 		}
 
-			Include ("pci2_hc.asl")
+			#include "acpi/pci2_hc.asl"
 		}
 	}
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl
index 2a86426b48..d4a853c18b 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl
@@ -75,7 +75,7 @@ DefinitionBlock ("SSDT3.aml", "SSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 				Return (Local3)
 			}
 
-			Include ("pci3_hc.asl")
+			#include "acpi/pci3_hc.asl"
 		}
 	}
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl
index b1fae61d5f..0513303f1b 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl
@@ -75,7 +75,7 @@ DefinitionBlock ("SSDT4.aml", "SSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 				Return (Local3)
 			}
 
-			Include ("pci4_hc.asl")
+			#include "acpi/pci4_hc.asl"
 		}
 	}
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl
index ba417341f0..553ccd4e2d 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl
@@ -76,7 +76,7 @@ DefinitionBlock ("SSDT5.aml", "SSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 				Return (Local3)
 			}
 
-			Include ("pci5_hc.asl")
+			#include "acpi/pci5_hc.asl"
 		}
 	}