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

The current directory is always part of the search path of cpp when
using #include "..."

Change-Id: I74fe39e0c79835e4b9a927afcbeab21040d8ae52
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/648
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

diff --git a/src/northbridge/intel/i945/acpi/i945.asl b/src/northbridge/intel/i945/acpi/i945.asl
index f5f4aae9e2ec813c16d7fe785240fd89688afa8a..47a6931c679ea1fbb4e02ed3dfb7427070d49f05 100644 (file)
--- a/src/northbridge/intel/i945/acpi/i945.asl
+++ b/src/northbridge/intel/i945/acpi/i945.asl
@@ -19,8 +19,8 @@
  * MA 02110-1301 USA
  */
 
  * MA 02110-1301 USA
  */
 

-#include "../../../northbridge/intel/i945/acpi/hostbridge.asl"
-#include "../../../northbridge/intel/i945/i945.h"
+#include "hostbridge.asl"
+#include "../i945.h"

 
 /* PCI Device Resource Consumption */
 Device (PDRC)
 
 /* PCI Device Resource Consumption */
 Device (PDRC)


@@ -77,10 +77,10 @@ Device (PDRC)
 }
 
 // PCIe graphics port 0:1.0
 }
 
 // PCIe graphics port 0:1.0

-#include "../../../northbridge/intel/i945/acpi/peg.asl"
+#include "peg.asl"

 
 // Integrated graphics 0:2.0
 
 // Integrated graphics 0:2.0

-#include "../../../northbridge/intel/i945/acpi/igd.asl"
+#include "igd.asl"

 
 Scope (\)
 {
 
 Scope (\)
 {

diff --git a/src/northbridge/intel/sch/acpi/sch.asl b/src/northbridge/intel/sch/acpi/sch.asl
index 0a11851ea025108506c5ca8e9dc4a23c103d1f6c..5e0b3f85aaf20421ed72c5021ec7cd14d1c2e1e3 100644 (file)
--- a/src/northbridge/intel/sch/acpi/sch.asl
+++ b/src/northbridge/intel/sch/acpi/sch.asl
@@ -19,7 +19,7 @@
  * MA 02110-1301 USA
  */
 
  * MA 02110-1301 USA
  */
 

-#include "../../../northbridge/intel/sch/acpi/hostbridge.asl"
+#include "hostbridge.asl"

 
 /* PCI Device Resource Consumption */
 Device (PDRC)
 
 /* PCI Device Resource Consumption */
 Device (PDRC)


@@ -76,10 +76,10 @@ Device (PDRC)
 }
 
 // PCIe graphics port 0:1.0
 }
 
 // PCIe graphics port 0:1.0

-#include "../../../northbridge/intel/sch/acpi/peg.asl"
+#include "peg.asl"

 
 // Integrated graphics 0:2.0
 
 // Integrated graphics 0:2.0

-#include "../../../northbridge/intel/sch/acpi/igd.asl"
+#include "igd.asl"

 
 Scope (\)
 {
 
 Scope (\)
 {

diff --git a/src/southbridge/intel/i82801gx/acpi/ich7.asl b/src/southbridge/intel/i82801gx/acpi/ich7.asl
index ad5bdd00b13af784f1d97eccc853695f963e7c2f..43950c40ac4fd6cc2e5d946b67ceb9b9b657c59d 100644 (file)
--- a/src/southbridge/intel/i82801gx/acpi/ich7.asl
+++ b/src/southbridge/intel/i82801gx/acpi/ich7.asl
@@ -165,30 +165,30 @@ Scope(\)
 }
 
 // 0:1b.0 High Definition Audio (Azalia)
 }
 
 // 0:1b.0 High Definition Audio (Azalia)

-#include "../../../southbridge/intel/i82801gx/acpi/audio.asl"
+#include "audio.asl"

 
 // PCI Express Ports
 
 // PCI Express Ports

-#include "../../../southbridge/intel/i82801gx/acpi/pcie.asl"
+#include "pcie.asl"

 
 // USB
 
 // USB

-#include "../../../southbridge/intel/i82801gx/acpi/usb.asl"
+#include "usb.asl"

 
 // PCI Bridge
 
 // PCI Bridge

-#include "../../../southbridge/intel/i82801gx/acpi/pci.asl"
+#include "pci.asl"

 
 // AC97 Audio and Modem
 
 // AC97 Audio and Modem

-#include "../../../southbridge/intel/i82801gx/acpi/ac97.asl"
+#include "ac97.asl"

 
 // LPC Bridge
 
 // LPC Bridge

-#include "../../../southbridge/intel/i82801gx/acpi/lpc.asl"
+#include "lpc.asl"

 
 // PATA
 
 // PATA

-#include "../../../southbridge/intel/i82801gx/acpi/pata.asl"
+#include "pata.asl"

 
 // SATA
 
 // SATA

-#include "../../../southbridge/intel/i82801gx/acpi/sata.asl"
+#include "sata.asl"

 
 // SMBus
 
 // SMBus

-#include "../../../southbridge/intel/i82801gx/acpi/smbus.asl"
+#include "smbus.asl"

 
 
 
 

diff --git a/src/southbridge/intel/i82801gx/acpi/lpc.asl b/src/southbridge/intel/i82801gx/acpi/lpc.asl
index 3166a89bafbb79fc4284254385fa9139075f5165..913849825c69fcd12ad3c7577d8b7ce85330a033 100644 (file)
--- a/src/southbridge/intel/i82801gx/acpi/lpc.asl
+++ b/src/southbridge/intel/i82801gx/acpi/lpc.asl
@@ -51,7 +51,7 @@ Device (LPCB)
                RCBA,   18,
        }
 
                RCBA,   18,
        }
 

-       #include "../../../southbridge/intel/i82801gx/acpi/irqlinks.asl"
+       #include "irqlinks.asl"

 
        #include "acpi/ec.asl"
 
 
        #include "acpi/ec.asl"
 

diff --git a/src/southbridge/intel/sch/acpi/lpc.asl b/src/southbridge/intel/sch/acpi/lpc.asl
index e847af4a455923480d35c5ade9ca1b7e7d01510f..788ac8531e9825de4a56afc28337a63226efa081 100644 (file)
--- a/src/southbridge/intel/sch/acpi/lpc.asl
+++ b/src/southbridge/intel/sch/acpi/lpc.asl
@@ -51,7 +51,7 @@ Device (LPCB)
                RCBA,   18,
        }
 
                RCBA,   18,
        }
 

-//     #include "../../../southbridge/intel/sch/acpi/irqlinks.asl"
+//     #include "irqlinks.asl"

        #include "irqlinks.asl"
 
        #include "acpi/ec.asl"
        #include "irqlinks.asl"
 
        #include "acpi/ec.asl"

diff --git a/src/southbridge/intel/sch/acpi/sch.asl b/src/southbridge/intel/sch/acpi/sch.asl
index c1e6e44a5a0265104b300a72c81fe5c3df9d8364..26f938e992fdadb98bc7c7c832752bb1e70e0a18 100644 (file)
--- a/src/southbridge/intel/sch/acpi/sch.asl
+++ b/src/southbridge/intel/sch/acpi/sch.asl
@@ -139,27 +139,27 @@ Scope(\)
 }
 
 // 0:1b.0 High Definition Audio (Azalia)
 }
 
 // 0:1b.0 High Definition Audio (Azalia)

-#include "../../../southbridge/intel/sch/acpi/audio.asl"
+#include "audio.asl"

 
 // PCI Express Ports
 
 // PCI Express Ports

-#include "../../../southbridge/intel/sch/acpi/pcie.asl"
+#include "pcie.asl"

 
 // USB
 
 // USB

-#include "../../../southbridge/intel/sch/acpi/usb.asl"
+#include "usb.asl"

 
 // PCI Bridge
 
 // PCI Bridge

-#include "../../../southbridge/intel/sch/acpi/pci.asl"
+#include "pci.asl"

 
 // AC97 Audio and Modem
 
 // AC97 Audio and Modem

-#include "../../../southbridge/intel/sch/acpi/ac97.asl"
+#include "ac97.asl"

 
 // LPC Bridge
 
 // LPC Bridge

-#include "../../../southbridge/intel/sch/acpi/lpc.asl"
+#include "lpc.asl"

 
 // PATA
 
 // PATA

-#include "../../../southbridge/intel/sch/acpi/pata.asl"
+#include "pata.asl"

 
 // SMBus
 
 // SMBus

-#include "../../../southbridge/intel/sch/acpi/smbus.asl"
+#include "smbus.asl"