summaryrefslogtreecommitdiff
path: root/src/mainboard/apple/macbook21
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2014-10-16 10:39:06 +0200
committerVladimir Serbinenko <phcoder@gmail.com>2014-12-03 21:02:50 +0100
commit24813c1490b016a10d91acbb9cc26c5b030f7314 (patch)
tree521261a36080555757335c196bdf8b1d40983430 /src/mainboard/apple/macbook21
parent4aad743434516d6c96f1afe21dd00b631e2c3692 (diff)
downloadcoreboot-24813c1490b016a10d91acbb9cc26c5b030f7314.tar.xz
i945: Consolidate acpi/platform.asl
Change-Id: Iccb2dda8a427e483c04693e46b00e0bc2452a26b Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/7086 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard/apple/macbook21')
-rw-r--r--src/mainboard/apple/macbook21/acpi/platform.asl119
-rw-r--r--src/mainboard/apple/macbook21/dsdt.asl3
2 files changed, 4 insertions, 118 deletions
diff --git a/src/mainboard/apple/macbook21/acpi/platform.asl b/src/mainboard/apple/macbook21/acpi/platform.asl
index 1c6ac6e6c2..99efbb3fb2 100644
--- a/src/mainboard/apple/macbook21/acpi/platform.asl
+++ b/src/mainboard/apple/macbook21/acpi/platform.asl
@@ -19,48 +19,6 @@
* MA 02110-1301 USA
*/
-/* These come from the dynamically created CPU SSDT */
-External(PDC0)
-External(PDC1)
-
-/* The APM port can be used for generating software SMIs */
-
-OperationRegion (APMP, SystemIO, 0xb2, 2)
-Field (APMP, ByteAcc, NoLock, Preserve)
-{
- APMC, 8, // APM command
- APMS, 8 // APM status
-}
-
-/* Port 80 POST */
-
-OperationRegion (POST, SystemIO, 0x80, 1)
-Field (POST, ByteAcc, Lock, Preserve)
-{
- DBG0, 8
-}
-
-/* SMI I/O Trap */
-Method(TRAP, 1, Serialized)
-{
- Store (Arg0, SMIF) // SMI Function
- Store (0, TRP0) // Generate trap
- Return (SMIF) // Return value of SMI handler
-}
-
-/* The _PIC method is called by the OS to choose between interrupt
- * routing via the i8259 interrupt controller or the APIC.
- *
- * _PIC is called with a parameter of 0 for i8259 configuration and
- * with a parameter of 1 for Local Apic/IOAPIC configuration.
- */
-
-Method(_PIC, 1)
-{
- // Remember the OS' IRQ routing choice.
- Store(Arg0, PICM)
-}
-
/* The _WAK method is called on system wakeup */
Method(_WAK,1)
@@ -85,38 +43,6 @@ Method(_WAK,1)
Return(Package(){0,0})
}
-// Power notification
-
-External (\_PR_.CPU0, DeviceObj)
-External (\_PR_.CPU1, DeviceObj)
-
-Method (PNOT)
-{
- If (MPEN) {
- If(And(PDC0, 0x08)) {
- Notify (\_PR_.CPU0, 0x80) // _PPC
-
- If (And(PDC0, 0x10)) {
- Sleep(100)
- Notify(\_PR_.CPU0, 0x81) // _CST
- }
- }
-
- If(And(PDC1, 0x08)) {
- Notify (\_PR_.CPU1, 0x80) // _PPC
- If (And(PDC1, 0x10)) {
- Sleep(100)
- Notify(\_PR_.CPU1, 0x81) // _CST
- }
- }
-
- } Else { // UP
- Notify (\_PR_.CPU0, 0x80)
- Sleep(0x64)
- Notify(\_PR_.CPU0, 0x81)
- }
-}
-
/* System Bus */
Scope(\_SB)
@@ -133,49 +59,7 @@ Scope(\_SB)
// 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, Local0)) {
- /* Linux answers _OSI with "True" for a couple of
- * Windows version queries. But unlike Windows it
- * needs a Video repost, so let's determine whether
- * we're running Linux.
- */
-
- If (_OSI("Linux")) {
- Store (1, LINX)
- }
-
- 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 2006")) {
- Store (2006, OSYS)
- }
- }
+ \GOS()
/* And the OS workarounds start right after we know what we're
* running: Windows XP SP1 needs to have C-State coordination
@@ -189,4 +73,3 @@ Scope(\_SB)
// TRAP(43) // TODO
}
}
-
diff --git a/src/mainboard/apple/macbook21/dsdt.asl b/src/mainboard/apple/macbook21/dsdt.asl
index fb0a34fa6a..5bc25c9fe6 100644
--- a/src/mainboard/apple/macbook21/dsdt.asl
+++ b/src/mainboard/apple/macbook21/dsdt.asl
@@ -37,6 +37,9 @@ DefinitionBlock(
// global NVS and variables
#include <southbridge/intel/i82801gx/acpi/globalnvs.asl>
+ #include <southbridge/intel/i82801gx/acpi/platform.asl>
+
+ #include <cpu/intel/model_6dx/acpi/cpu.asl>
Scope (\_SB) {
Device (PCI0)