diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2014-08-22 11:05:26 -0700 |
|---|---|---|
| committer | Marc Jones <marc.jones@se-eng.com> | 2015-03-27 06:05:53 +0100 |
| commit | 63dc01b76ec69520fa9becb05b91cfb4d86f9469 (patch) | |
| tree | 6c35d88f81addcfe01fe7c3f5d695ef9e000fe69 /src/mainboard/google | |
| parent | 3215dfb6efb7d6b8efca63f3bf0c309dd36c69f5 (diff) | |
samus: Switch to using broadwell platform ASL
Instead of providing a local copy use the chipset provided one.
BUG=chrome-os-partner:28234
BRANCH=none
TEST=build and boot on samus
Original-Change-Id: I60dd9bbeefbf4298511abec54635c515fc9b1621
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/213793
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
(cherry picked from commit 9dc8e7ae61f0337aa145b7d99acc23852d1cfc9a)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Change-Id: I259be321e01e2047666b4be106dea59a5578d9d3
Reviewed-on: http://review.coreboot.org/8962
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/mainboard/google')
| -rw-r--r-- | src/mainboard/google/samus/acpi/platform.asl | 72 | ||||
| -rw-r--r-- | src/mainboard/google/samus/dsdt.asl | 2 |
2 files changed, 1 insertions, 73 deletions
diff --git a/src/mainboard/google/samus/acpi/platform.asl b/src/mainboard/google/samus/acpi/platform.asl deleted file mode 100644 index e6aaf75952..0000000000 --- a/src/mainboard/google/samus/acpi/platform.asl +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * Copyright (C) 2012 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* 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 _PTS method (Prepare To Sleep) is called before the OS is - * entering a sleep state. The sleep state number is passed in Arg0 - */ - -Method(_PTS,1) -{ -} - -/* The _WAK method is called on system wakeup */ - -Method(_WAK,1) -{ - Return(Package(){0,0}) -} diff --git a/src/mainboard/google/samus/dsdt.asl b/src/mainboard/google/samus/dsdt.asl index ea0d01b176..cfd20371b0 100644 --- a/src/mainboard/google/samus/dsdt.asl +++ b/src/mainboard/google/samus/dsdt.asl @@ -30,7 +30,7 @@ DefinitionBlock( ) { // Some generic macros - #include "acpi/platform.asl" + #include <soc/intel/broadwell/acpi/platform.asl> // global NVS and variables #include <soc/intel/broadwell/acpi/globalnvs.asl> |