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>

3 files changed, 30 insertions, 30 deletions

diff --git a/src/mainboard/supermicro/h8qgi/dsdt.asl b/src/mainboard/supermicro/h8qgi/dsdt.asl
index b45403e508..6e70bc84d0 100644
--- a/src/mainboard/supermicro/h8qgi/dsdt.asl
+++ b/src/mainboard/supermicro/h8qgi/dsdt.asl
@@ -55,7 +55,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, 0)	/* Default interrupt model is PIC */
 
@@ -458,23 +458,23 @@ DefinitionBlock (
 	}
 
 	Scope(\_SB) {
-		Method(CkOT, 0){
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+		Method(OSFL, 0){
+			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(CIRQ, 0x00, NotSerialized){
@@ -1275,7 +1275,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)
@@ -1594,7 +1594,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
 				 *    	Store(0,\PWDE)
diff --git a/src/mainboard/supermicro/h8scm/dsdt.asl b/src/mainboard/supermicro/h8scm/dsdt.asl
index 5e183753df..88c455b7ab 100644
--- a/src/mainboard/supermicro/h8scm/dsdt.asl
+++ b/src/mainboard/supermicro/h8scm/dsdt.asl
@@ -55,7 +55,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 */
 
@@ -450,23 +450,23 @@ DefinitionBlock (
 	#include "acpi/routing.asl"
 
 	Scope(\_SB) {
-		Method(CkOT, 0){
-			if(LNotEqual(OSTP, Ones)) {Return(OSTP)}	/* OS version was already detected */
+		Method(OSFL, 0){
+			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)
@@ -1291,7 +1291,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)
@@ -1610,7 +1610,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {
 				 *    	Store(0,\PWDE)
diff --git a/src/mainboard/supermicro/h8scm_fam10/dsdt.asl b/src/mainboard/supermicro/h8scm_fam10/dsdt.asl
index 13e5620876..d3cf16b122 100644
--- a/src/mainboard/supermicro/h8scm_fam10/dsdt.asl
+++ b/src/mainboard/supermicro/h8scm_fam10/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 */
 
@@ -433,25 +433,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)
@@ -1386,7 +1386,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)
@@ -1711,7 +1711,7 @@ DefinitionBlock (
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {