Avoid ../../.. paths in ASL files

[coreboot.git] / src / northbridge / intel / i945 / acpi / i945.asl

diff --git a/src/northbridge/intel/i945/acpi/i945.asl b/src/northbridge/intel/i945/acpi/i945.asl
index 49986f9cef8dcd2c9d96fe963752ea1fbd7c106b..47a6931c679ea1fbb4e02ed3dfb7427070d49f05 100644 (file)
--- a/src/northbridge/intel/i945/acpi/i945.asl
+++ b/src/northbridge/intel/i945/acpi/i945.asl
@@ -19,7 +19,8 @@
  * MA 02110-1301 USA
  */
 
-Include ("../../../northbridge/intel/i945/acpi/i945_hostbridge.asl")
+#include "hostbridge.asl"
+#include "../i945.h"
 
 /* PCI Device Resource Consumption */
 Device (PDRC)
@@ -29,7 +30,7 @@ Device (PDRC)
 
        // This does not seem to work correctly yet - set values statically for
        // now.
-       
+
        //Name (PDRS, ResourceTemplate() {
        //      Memory32Fixed(ReadWrite, 0x00000000, 0x00004000, RCRB) // RCBA
        //      Memory32Fixed(ReadWrite, 0x00000000, 0x00004000, MCHB) // MCHBAR
@@ -41,10 +42,10 @@ Device (PDRC)
 
        Name (PDRS, ResourceTemplate() {
                Memory32Fixed(ReadWrite, 0xfed1c000, 0x00004000) // RCBA
-               Memory32Fixed(ReadWrite, 0xfed14000, 0x00004000) // MCHBAR
-               Memory32Fixed(ReadWrite, 0xfed18000, 0x00001000) // DMIBAR
-               Memory32Fixed(ReadWrite, 0xfed19000, 0x00001000) // EPBAR
-               Memory32Fixed(ReadWrite, 0xf0000000, 0x04000000) // PCIE BAR
+               Memory32Fixed(ReadWrite, DEFAULT_MCHBAR,   0x00004000)
+               Memory32Fixed(ReadWrite, DEFAULT_DMIBAR,   0x00001000)
+               Memory32Fixed(ReadWrite, DEFAULT_EPBAR,    0x00001000)
+               Memory32Fixed(ReadWrite, DEFAULT_PCIEXBAR, 0x04000000)
                Memory32Fixed(ReadWrite, 0xfed20000, 0x00020000) // Misc ICH
                Memory32Fixed(ReadWrite, 0xfed40000, 0x00005000) // Misc ICH
                Memory32Fixed(ReadWrite, 0xfed45000, 0x0004b000) // Misc ICH
@@ -76,13 +77,13 @@ Device (PDRC)
 }
 
 // PCIe graphics port 0:1.0
-Include ("../../../northbridge/intel/i945/acpi/i945_peg.asl")
+#include "peg.asl"
 
 // Integrated graphics 0:2.0
-Include ("../../../northbridge/intel/i945/acpi/i945_igd.asl")
+#include "igd.asl"
 
 Scope (\)
 {
        // backlight control, display switching, lid
-       Include ("acpi/video.asl")
+       #include "acpi/video.asl"
 }