summaryrefslogtreecommitdiff
path: root/src/mainboard/asus
diff options
context:
space:
mode:
authorEdward O'Callaghan <eocallaghan@alterapraxis.com>2014-05-31 13:57:52 +1000
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-06-14 20:47:57 +0200
commitf7d8f09d7637915c98fca4832d4085aec949c7e0 (patch)
tree86d7a38523d05cb9c964e473ddb432274c2e1b8b /src/mainboard/asus
parent7a22b0976c16d09eed5ab07beb28942fe70b8b43 (diff)
downloadcoreboot-f7d8f09d7637915c98fca4832d4085aec949c7e0.tar.xz
amd/agesa,cimx: Rename ACPI OS detection methods
Try to 'standardize' the otherwise peculiar method naming to be somewhat more in-line with other ACPI implementations. This makes it easier to compare with vendor DSDT dumps for example. Change-Id: I5ba54f7361796669ac0cab7ff91e7de43b22e846 Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-on: http://review.coreboot.org/5888 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Diffstat (limited to 'src/mainboard/asus')
-rw-r--r--src/mainboard/asus/f2a85-m/acpi/mainboard.asl2
-rw-r--r--src/mainboard/asus/m4a78-em/dsdt.asl20
-rw-r--r--src/mainboard/asus/m4a785-m/dsdt.asl20
-rw-r--r--src/mainboard/asus/m4a785t-m/dsdt.asl20
-rw-r--r--src/mainboard/asus/m5a88-v/dsdt.asl20
5 files changed, 41 insertions, 41 deletions
diff --git a/src/mainboard/asus/f2a85-m/acpi/mainboard.asl b/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
index f554bbd10f..a2c3119599 100644
--- a/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
@@ -31,6 +31,6 @@
Name(SSFG, 0x0D) /* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
/* Some global data */
- Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
Name(OSV, Ones) /* Assume nothing */
Name(PMOD, One) /* Assume APIC */
diff --git a/src/mainboard/asus/m4a78-em/dsdt.asl b/src/mainboard/asus/m4a78-em/dsdt.asl
index a844640bd4..ab58dd00d8 100644
--- a/src/mainboard/asus/m4a78-em/dsdt.asl
+++ b/src/mainboard/asus/m4a78-em/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
Name(UOM9, 6)
/* Some global data */
- Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
Name(OSV, Ones) /* Assume nothing */
Name(PMOD, One) /* Assume APIC */
@@ -415,25 +415,25 @@ DefinitionBlock (
Scope(\_SB) {
- Method(CkOT, 0){
+ Method(OSFL, 0){
- if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */
+ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1))
{
- Store(1, OSTP) /* Assume some form of XP */
+ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */
{
- Store(2, OSTP)
+ Store(2, OSVR)
}
} else {
If(WCMP(\_OS,"Linux")) {
- Store(3, OSTP) /* Linux */
+ Store(3, OSVR) /* Linux */
} Else {
- Store(4, OSTP) /* Gotta be WinCE */
+ Store(4, OSVR) /* Gotta be WinCE */
}
}
- Return(OSTP)
+ Return(OSVR)
}
Method(_PIC, 0x01, NotSerialized)
@@ -1350,7 +1350,7 @@ DefinitionBlock (
}
Method(_INI) {
- If(LEqual(OSTP,3)){ /* If we are running Linux */
+ If(LEqual(OSVR,3)){ /* If we are running Linux */
Store(zero, NSEN)
Store(one, NSDO)
Store(one, NSDI)
@@ -1655,7 +1655,7 @@ DefinitionBlock (
/* DBGO("\n") */
/* Determine the OS we're running on */
- CkOT()
+ OSFL()
/* On older chips, clear PciExpWakeDisEn */
/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/asus/m4a785-m/dsdt.asl b/src/mainboard/asus/m4a785-m/dsdt.asl
index a844640bd4..ab58dd00d8 100644
--- a/src/mainboard/asus/m4a785-m/dsdt.asl
+++ b/src/mainboard/asus/m4a785-m/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
Name(UOM9, 6)
/* Some global data */
- Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
Name(OSV, Ones) /* Assume nothing */
Name(PMOD, One) /* Assume APIC */
@@ -415,25 +415,25 @@ DefinitionBlock (
Scope(\_SB) {
- Method(CkOT, 0){
+ Method(OSFL, 0){
- if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */
+ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1))
{
- Store(1, OSTP) /* Assume some form of XP */
+ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */
{
- Store(2, OSTP)
+ Store(2, OSVR)
}
} else {
If(WCMP(\_OS,"Linux")) {
- Store(3, OSTP) /* Linux */
+ Store(3, OSVR) /* Linux */
} Else {
- Store(4, OSTP) /* Gotta be WinCE */
+ Store(4, OSVR) /* Gotta be WinCE */
}
}
- Return(OSTP)
+ Return(OSVR)
}
Method(_PIC, 0x01, NotSerialized)
@@ -1350,7 +1350,7 @@ DefinitionBlock (
}
Method(_INI) {
- If(LEqual(OSTP,3)){ /* If we are running Linux */
+ If(LEqual(OSVR,3)){ /* If we are running Linux */
Store(zero, NSEN)
Store(one, NSDO)
Store(one, NSDI)
@@ -1655,7 +1655,7 @@ DefinitionBlock (
/* DBGO("\n") */
/* Determine the OS we're running on */
- CkOT()
+ OSFL()
/* On older chips, clear PciExpWakeDisEn */
/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/asus/m4a785t-m/dsdt.asl b/src/mainboard/asus/m4a785t-m/dsdt.asl
index 5449d01231..4a56f266cf 100644
--- a/src/mainboard/asus/m4a785t-m/dsdt.asl
+++ b/src/mainboard/asus/m4a785t-m/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
Name(UOM9, 6)
/* Some global data */
- Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
Name(OSV, Ones) /* Assume nothing */
Name(PMOD, One) /* Assume APIC */
@@ -415,25 +415,25 @@ DefinitionBlock (
Scope(\_SB) {
- Method(CkOT, 0){
+ Method(OSFL, 0){
- if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */
+ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1))
{
- Store(1, OSTP) /* Assume some form of XP */
+ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */
{
- Store(2, OSTP)
+ Store(2, OSVR)
}
} else {
If(WCMP(\_OS,"Linux")) {
- Store(3, OSTP) /* Linux */
+ Store(3, OSVR) /* Linux */
} Else {
- Store(4, OSTP) /* Gotta be WinCE */
+ Store(4, OSVR) /* Gotta be WinCE */
}
}
- Return(OSTP)
+ Return(OSVR)
}
Method(_PIC, 0x01, NotSerialized)
@@ -1350,7 +1350,7 @@ DefinitionBlock (
}
Method(_INI) {
- If(LEqual(OSTP,3)){ /* If we are running Linux */
+ If(LEqual(OSVR,3)){ /* If we are running Linux */
Store(zero, NSEN)
Store(one, NSDO)
Store(one, NSDI)
@@ -1578,7 +1578,7 @@ DefinitionBlock (
/* DBGO("\n") */
/* Determine the OS we're running on */
- CkOT()
+ OSFL()
/* On older chips, clear PciExpWakeDisEn */
/*if (LLessEqual(\SBRI, 0x13)) {
diff --git a/src/mainboard/asus/m5a88-v/dsdt.asl b/src/mainboard/asus/m5a88-v/dsdt.asl
index 6e1ccd1eba..8ce2991110 100644
--- a/src/mainboard/asus/m5a88-v/dsdt.asl
+++ b/src/mainboard/asus/m5a88-v/dsdt.asl
@@ -54,7 +54,7 @@ DefinitionBlock (
Name(UOM9, 6)
/* Some global data */
- Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
Name(OSV, Ones) /* Assume nothing */
Name(PMOD, One) /* Assume APIC */
@@ -410,25 +410,25 @@ DefinitionBlock (
Scope(\_SB) {
- Method(CkOT, 0){
+ Method(OSFL, 0){
- if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */
+ if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */
if(CondRefOf(\_OSI,Local1))
{
- Store(1, OSTP) /* Assume some form of XP */
+ Store(1, OSVR) /* Assume some form of XP */
if (\_OSI("Windows 2006")) /* Vista */
{
- Store(2, OSTP)
+ Store(2, OSVR)
}
} else {
If(WCMP(\_OS,"Linux")) {
- Store(3, OSTP) /* Linux */
+ Store(3, OSVR) /* Linux */
} Else {
- Store(4, OSTP) /* Gotta be WinCE */
+ Store(4, OSVR) /* Gotta be WinCE */
}
}
- Return(OSTP)
+ Return(OSVR)
}
Method(_PIC, 0x01, NotSerialized)
@@ -1381,7 +1381,7 @@ DefinitionBlock (
}
Method(_INI) {
- If(LEqual(OSTP,3)){ /* If we are running Linux */
+ If(LEqual(OSVR,3)){ /* If we are running Linux */
Store(zero, NSEN)
Store(one, NSDO)
Store(one, NSDI)
@@ -1628,7 +1628,7 @@ DefinitionBlock (
/* DBGO("\n") */
/* Determine the OS we're running on */
- CkOT()
+ OSFL()
/* On older chips, clear PciExpWakeDisEn */
/*if (LLessEqual(\SBRI, 0x13)) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 12:39:34 +0000