Patrick Georgi (patrick@georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/648
-gerrit
commit 87af06a897dd92ae94e45f4b1d1f6d9719cf3edd Author: Patrick Georgi patrick@georgi-clan.de Date: Thu Feb 16 19:01:22 2012 +0100
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 --- src/northbridge/intel/i945/acpi/i945.asl | 8 ++++---- src/northbridge/intel/sch/acpi/sch.asl | 6 +++--- src/southbridge/intel/i82801gx/acpi/ich7.asl | 18 +++++++++--------- src/southbridge/intel/i82801gx/acpi/lpc.asl | 2 +- src/southbridge/intel/sch/acpi/lpc.asl | 2 +- src/southbridge/intel/sch/acpi/sch.asl | 16 ++++++++-------- 6 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/northbridge/intel/i945/acpi/i945.asl b/src/northbridge/intel/i945/acpi/i945.asl index f5f4aae..47a6931 100644 --- a/src/northbridge/intel/i945/acpi/i945.asl +++ b/src/northbridge/intel/i945/acpi/i945.asl @@ -19,8 +19,8 @@ * 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) @@ -77,10 +77,10 @@ Device (PDRC) }
// PCIe graphics port 0:1.0 -#include "../../../northbridge/intel/i945/acpi/peg.asl" +#include "peg.asl"
// Integrated graphics 0:2.0 -#include "../../../northbridge/intel/i945/acpi/igd.asl" +#include "igd.asl"
Scope () { diff --git a/src/northbridge/intel/sch/acpi/sch.asl b/src/northbridge/intel/sch/acpi/sch.asl index 0a11851..5e0b3f8 100644 --- a/src/northbridge/intel/sch/acpi/sch.asl +++ b/src/northbridge/intel/sch/acpi/sch.asl @@ -19,7 +19,7 @@ * MA 02110-1301 USA */
-#include "../../../northbridge/intel/sch/acpi/hostbridge.asl" +#include "hostbridge.asl"
/* PCI Device Resource Consumption */ Device (PDRC) @@ -76,10 +76,10 @@ Device (PDRC) }
// PCIe graphics port 0:1.0 -#include "../../../northbridge/intel/sch/acpi/peg.asl" +#include "peg.asl"
// Integrated graphics 0:2.0 -#include "../../../northbridge/intel/sch/acpi/igd.asl" +#include "igd.asl"
Scope () { diff --git a/src/southbridge/intel/i82801gx/acpi/ich7.asl b/src/southbridge/intel/i82801gx/acpi/ich7.asl index ad5bdd0..43950c4 100644 --- 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) -#include "../../../southbridge/intel/i82801gx/acpi/audio.asl" +#include "audio.asl"
// PCI Express Ports -#include "../../../southbridge/intel/i82801gx/acpi/pcie.asl" +#include "pcie.asl"
// USB -#include "../../../southbridge/intel/i82801gx/acpi/usb.asl" +#include "usb.asl"
// PCI Bridge -#include "../../../southbridge/intel/i82801gx/acpi/pci.asl" +#include "pci.asl"
// AC97 Audio and Modem -#include "../../../southbridge/intel/i82801gx/acpi/ac97.asl" +#include "ac97.asl"
// LPC Bridge -#include "../../../southbridge/intel/i82801gx/acpi/lpc.asl" +#include "lpc.asl"
// PATA -#include "../../../southbridge/intel/i82801gx/acpi/pata.asl" +#include "pata.asl"
// SATA -#include "../../../southbridge/intel/i82801gx/acpi/sata.asl" +#include "sata.asl"
// 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 3166a89..9138498 100644 --- a/src/southbridge/intel/i82801gx/acpi/lpc.asl +++ b/src/southbridge/intel/i82801gx/acpi/lpc.asl @@ -51,7 +51,7 @@ Device (LPCB) RCBA, 18, }
- #include "../../../southbridge/intel/i82801gx/acpi/irqlinks.asl" + #include "irqlinks.asl"
#include "acpi/ec.asl"
diff --git a/src/southbridge/intel/sch/acpi/lpc.asl b/src/southbridge/intel/sch/acpi/lpc.asl index e847af4..788ac85 100644 --- a/src/southbridge/intel/sch/acpi/lpc.asl +++ b/src/southbridge/intel/sch/acpi/lpc.asl @@ -51,7 +51,7 @@ Device (LPCB) RCBA, 18, }
-// #include "../../../southbridge/intel/sch/acpi/irqlinks.asl" +// #include "irqlinks.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 c1e6e44..26f938e 100644 --- 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) -#include "../../../southbridge/intel/sch/acpi/audio.asl" +#include "audio.asl"
// PCI Express Ports -#include "../../../southbridge/intel/sch/acpi/pcie.asl" +#include "pcie.asl"
// USB -#include "../../../southbridge/intel/sch/acpi/usb.asl" +#include "usb.asl"
// PCI Bridge -#include "../../../southbridge/intel/sch/acpi/pci.asl" +#include "pci.asl"
// AC97 Audio and Modem -#include "../../../southbridge/intel/sch/acpi/ac97.asl" +#include "ac97.asl"
// LPC Bridge -#include "../../../southbridge/intel/sch/acpi/lpc.asl" +#include "lpc.asl"
// PATA -#include "../../../southbridge/intel/sch/acpi/pata.asl" +#include "pata.asl"
// SMBus -#include "../../../southbridge/intel/sch/acpi/smbus.asl" +#include "smbus.asl"