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>
diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/frontrunner-af/dsdt.asl
index 90d2690..bbd3e4f 100644
--- a/src/mainboard/lippert/frontrunner-af/dsdt.asl
+++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl
@@ -54,7 +54,7 @@
 	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 */
 
@@ -404,25 +404,25 @@
 
 	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)
@@ -1639,7 +1639,7 @@
 				/* DBGO("\n") */
 
 				/* Determine the OS we're running on */
-				CkOT()
+				OSFL()
 
 				/* On older chips, clear PciExpWakeDisEn */
 				/*if (LLessEqual(\SBRI, 0x13)) {