Arthur Heymans has uploaded this change for review.

View Change

*.asl: Don't define Devices by absolute path

Be consistent with the rest tree and set the scope first when defining
devices. In general make the resulting code more readable as it avoid
'^' symbols.

Change-Id: I0b8dd33fac7cb1524d920b77e95c08b839157e8f
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
---
M src/mainboard/asus/h61m-cs/dsdt.asl
M src/mainboard/asus/p8z77-m_pro/dsdt.asl
M src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl
M src/mainboard/lenovo/t440p/dsdt.asl
M src/mainboard/msi/ms7707/dsdt.asl
M src/mainboard/supermicro/x10slm-f/dsdt.asl
M util/autoport/main.go
7 files changed, 42 insertions(+), 32 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/36600/1
diff --git a/src/mainboard/asus/h61m-cs/dsdt.asl b/src/mainboard/asus/h61m-cs/dsdt.asl
index 0e1cc3a..a1a70c0 100644
--- a/src/mainboard/asus/h61m-cs/dsdt.asl
+++ b/src/mainboard/asus/h61m-cs/dsdt.asl
@@ -32,9 +32,11 @@
#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>

- Device (\_SB.PCI0) {
- #include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
- #include <drivers/intel/gma/acpi/default_brightness_levels.asl>
- #include <southbridge/intel/bd82x6x/acpi/pch.asl>
+ Scope (\_SB) {
+ Device (PCI0) {
+ #include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
+ #include <drivers/intel/gma/acpi/default_brightness_levels.asl>
+ #include <southbridge/intel/bd82x6x/acpi/pch.asl>
+ }
}
}
diff --git a/src/mainboard/asus/p8z77-m_pro/dsdt.asl b/src/mainboard/asus/p8z77-m_pro/dsdt.asl
index 1c7a620..2c14e8f 100644
--- a/src/mainboard/asus/p8z77-m_pro/dsdt.asl
+++ b/src/mainboard/asus/p8z77-m_pro/dsdt.asl
@@ -34,10 +34,11 @@
#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>

- Device (\_SB.PCI0)
- {
- #include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
- #include <drivers/intel/gma/acpi/default_brightness_levels.asl>
- #include <southbridge/intel/bd82x6x/acpi/pch.asl>
+ Scope (\_SB) {
+ Device (PCI0) {
+ #include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
+ #include <drivers/intel/gma/acpi/default_brightness_levels.asl>
+ #include <southbridge/intel/bd82x6x/acpi/pch.asl>
+ }
}
}
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl b/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl
index 7ee12a0..e54b01b 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl
+++ b/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl
@@ -37,10 +37,11 @@
#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>

- Device (\_SB.PCI0)
- {
- #include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
- #include <drivers/intel/gma/acpi/default_brightness_levels.asl>
- #include <southbridge/intel/bd82x6x/acpi/pch.asl>
+ Scope (\_SB) {
+ Device (PCI0) {
+ #include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
+ #include <drivers/intel/gma/acpi/default_brightness_levels.asl>
+ #include <southbridge/intel/bd82x6x/acpi/pch.asl>
+ }
}
}
diff --git a/src/mainboard/lenovo/t440p/dsdt.asl b/src/mainboard/lenovo/t440p/dsdt.asl
index 82358aa..fd37f9e 100644
--- a/src/mainboard/lenovo/t440p/dsdt.asl
+++ b/src/mainboard/lenovo/t440p/dsdt.asl
@@ -37,10 +37,11 @@
#include <southbridge/intel/lynxpoint/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>

- Device (\_SB.PCI0)
- {
- #include <northbridge/intel/haswell/acpi/haswell.asl>
- #include <drivers/intel/gma/acpi/default_brightness_levels.asl>
- #include <southbridge/intel/lynxpoint/acpi/pch.asl>
+ Scope (\_SB) {
+ Device (PCI0) {
+ #include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
+ #include <drivers/intel/gma/acpi/default_brightness_levels.asl>
+ #include <southbridge/intel/bd82x6x/acpi/pch.asl>
+ }
}
}
diff --git a/src/mainboard/msi/ms7707/dsdt.asl b/src/mainboard/msi/ms7707/dsdt.asl
index d3e3602..6df1394 100644
--- a/src/mainboard/msi/ms7707/dsdt.asl
+++ b/src/mainboard/msi/ms7707/dsdt.asl
@@ -32,10 +32,11 @@
#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>

- Device (\_SB.PCI0)
- {
- #include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
- #include <drivers/intel/gma/acpi/default_brightness_levels.asl>
- #include <southbridge/intel/bd82x6x/acpi/pch.asl>
+ Scope (\_SB) {
+ Device (PCI0) {
+ #include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
+ #include <drivers/intel/gma/acpi/default_brightness_levels.asl>
+ #include <southbridge/intel/bd82x6x/acpi/pch.asl>
+ }
}
}
diff --git a/src/mainboard/supermicro/x10slm-f/dsdt.asl b/src/mainboard/supermicro/x10slm-f/dsdt.asl
index 6ed19ee..8649a95 100644
--- a/src/mainboard/supermicro/x10slm-f/dsdt.asl
+++ b/src/mainboard/supermicro/x10slm-f/dsdt.asl
@@ -24,10 +24,11 @@
#include <southbridge/intel/common/acpi/sleepstates.asl>
#include <cpu/intel/common/acpi/cpu.asl>

- Device (\_SB.PCI0)
- {
- #include <northbridge/intel/haswell/acpi/haswell.asl>
- #include <southbridge/intel/lynxpoint/acpi/pch.asl>
- #include <drivers/intel/gma/acpi/default_brightness_levels.asl>
+ Scope (\_SB) {
+ Device (PCI0) {
+ #include <northbridge/intel/sandybridge/acpi/sandybridge.asl>
+ #include <drivers/intel/gma/acpi/default_brightness_levels.asl>
+ #include <southbridge/intel/bd82x6x/acpi/pch.asl>
+ }
}
}
diff --git a/util/autoport/main.go b/util/autoport/main.go
index 03523a2..51d10cf 100644
--- a/util/autoport/main.go
+++ b/util/autoport/main.go
@@ -876,17 +876,20 @@
}

dsdt.WriteString(`
- Device (\_SB.PCI0)
+ Scope (\_SB)
{
+ Device (PCI0)
+ {
`)
for _, x := range DSDTPCI0Includes {
if x.Comment != "" {
fmt.Fprintf(dsdt, "\t/* %s. */\n", x.Comment)
}
- fmt.Fprintf(dsdt, "\t\t#include <%s>\n", x.File)
+ fmt.Fprintf(dsdt, "\t\t\t#include <%s>\n", x.File)
}
dsdt.WriteString(
- ` }
+ ` }
+ }
}
`)


To view, visit change 36600. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I0b8dd33fac7cb1524d920b77e95c08b839157e8f
Gerrit-Change-Number: 36600
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-MessageType: newchange