Attention is currently required from: Alexander Couzens, Patrick Rudolph.
Kyösti Mälkki has uploaded this change for review.
Use GOS() to detect HPET visibility
Update the detected _OSI strings from mb/ to sb/intel/common.
Change-Id: I50ba3c836f62cbeea97a1f73e5229f777a4ba296
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
M src/mainboard/lenovo/x201/acpi/platform.asl
M src/mainboard/packardbell/ms2290/acpi/platform.asl
M src/southbridge/intel/common/acpi/platform.asl
3 files changed, 26 insertions(+), 113 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/49350/1
diff --git a/src/mainboard/lenovo/x201/acpi/platform.asl b/src/mainboard/lenovo/x201/acpi/platform.asl
index b03f45f..1a3279d 100644
--- a/src/mainboard/lenovo/x201/acpi/platform.asl
+++ b/src/mainboard/lenovo/x201/acpi/platform.asl
@@ -42,62 +42,6 @@
/* TRAP(71) */ /* TODO */
- /* Determine the Operating System and save the value in OSYS.
- * We have to do this in order to be able to work around
- * certain windows bugs.
- *
- * OSYS value | Operating System
- * -----------+------------------
- * 2000 | Windows 2000
- * 2001 | Windows XP(+SP1)
- * 2002 | Windows XP SP2
- * 2006 | Windows Vista
- * ???? | Windows 7
- */
-
- /* Let's assume we're running at least Windows 2000 */
- Store (2000, OSYS)
-
- If (CondRefOf(_OSI)) {
- If (_OSI("Windows 2001")) {
- Store (2001, OSYS)
- }
-
- If (_OSI("Windows 2001 SP1")) {
- Store (2001, OSYS)
- }
-
- If (_OSI("Windows 2001 SP2")) {
- Store (2002, OSYS)
- }
-
- If (_OSI("Windows 2001.1")) {
- Store (2001, OSYS)
- }
-
- If (_OSI("Windows 2001.1 SP1")) {
- Store (2001, OSYS)
- }
-
- If (_OSI("Windows 2006")) {
- Store (2006, OSYS)
- }
-
- If (_OSI("Windows 2006.1")) {
- Store (2006, OSYS)
- }
-
- If (_OSI("Windows 2006 SP1")) {
- Store (2006, OSYS)
- }
-
- If (_OSI("Windows 2009")) {
- Store (2009, OSYS)
- }
-
- If (_OSI("Windows 2012")) {
- Store (2012, OSYS)
- }
- }
+ \GOS()
}
}
diff --git a/src/mainboard/packardbell/ms2290/acpi/platform.asl b/src/mainboard/packardbell/ms2290/acpi/platform.asl
index 297eeb4..7044e05 100644
--- a/src/mainboard/packardbell/ms2290/acpi/platform.asl
+++ b/src/mainboard/packardbell/ms2290/acpi/platform.asl
@@ -32,62 +32,7 @@
/* TRAP(71) */ /* TODO */
- /* Determine the Operating System and save the value in OSYS.
- * We have to do this in order to be able to work around
- * certain windows bugs.
- *
- * OSYS value | Operating System
- * -----------+------------------
- * 2000 | Windows 2000
- * 2001 | Windows XP(+SP1)
- * 2002 | Windows XP SP2
- * 2006 | Windows Vista
- * ???? | Windows 7
- */
+ \GOS()
- /* Let's assume we're running at least Windows 2000 */
- Store (2000, OSYS)
-
- If (CondRefOf(_OSI)) {
- If (_OSI("Windows 2001")) {
- Store (2001, OSYS)
- }
-
- If (_OSI("Windows 2001 SP1")) {
- Store (2001, OSYS)
- }
-
- If (_OSI("Windows 2001 SP2")) {
- Store (2002, OSYS)
- }
-
- If (_OSI("Windows 2001.1")) {
- Store (2001, OSYS)
- }
-
- If (_OSI("Windows 2001.1 SP1")) {
- Store (2001, OSYS)
- }
-
- If (_OSI("Windows 2006")) {
- Store (2006, OSYS)
- }
-
- If (_OSI("Windows 2006.1")) {
- Store (2006, OSYS)
- }
-
- If (_OSI("Windows 2006 SP1")) {
- Store (2006, OSYS)
- }
-
- If (_OSI("Windows 2009")) {
- Store (2009, OSYS)
- }
-
- If (_OSI("Windows 2012")) {
- Store (2012, OSYS)
- }
- }
}
}
diff --git a/src/southbridge/intel/common/acpi/platform.asl b/src/southbridge/intel/common/acpi/platform.asl
index b1dda02..bef5273 100644
--- a/src/southbridge/intel/common/acpi/platform.asl
+++ b/src/southbridge/intel/common/acpi/platform.asl
@@ -69,8 +69,32 @@
OSYS = 2002
}
+ If (_OSI("Windows 2001.1")) {
+ OSYS = 2001
+ }
+
+ If (_OSI("Windows 2001.1 SP1")) {
+ OSYS = 2001
+ }
+
If (_OSI("Windows 2006")) {
OSYS = 2006
}
+
+ If (_OSI("Windows 2006.1")) {
+ OSYS = 2006
+ }
+
+ If (_OSI("Windows 2006 SP1")) {
+ OSYS = 2006
+ }
+
+ If (_OSI("Windows 2009")) {
+ OSYS = 2009
+ }
+
+ If (_OSI("Windows 2012")) {
+ OSYS = 2012
+ }
}
}
To view, visit change 49350. To unsubscribe, or for help writing mail filters, visit settings.