[coreboot] New patch to review for coreboot: 428cab4 Move GGL0001 ACPI code to generic ChromeOS code
Stefan Reinauer (stefan.reinauer@coreboot.org)
gerrit at coreboot.org
Mon Jul 23 23:20:55 CEST 2012
Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1278
-gerrit
commit 428cab4ee82c28829af13fad56db22914530ee68
Author: Stefan Reinauer <reinauer at chromium.org>
Date: Thu Jun 7 15:38:44 2012 -0700
Move GGL0001 ACPI code to generic ChromeOS code
The only difference in this code on all our platforms is the array
describing the GPIOs. Hence, only keep that array in the mainboard
ChromeOS directory and move everything else to generic ChromeOS ACPI
code.
Change-Id: I9fc75842af64530c1255bea1c5f803c5316d6da6
Signed-off-by: Stefan Reinauer <reinauer at google.com>
---
src/mainboard/intel/emeraldlake2/acpi/chromeos.asl | 100 +-----------------
src/mainboard/intel/emeraldlake2/dsdt.asl | 1 +
src/mainboard/samsung/lumpy/acpi/chromeos.asl | 99 +-----------------
src/mainboard/samsung/lumpy/dsdt.asl | 1 +
src/mainboard/samsung/stumpy/acpi/chromeos.asl | 100 +-----------------
src/mainboard/samsung/stumpy/dsdt.asl | 1 +
src/vendorcode/google/chromeos/acpi/chromeos.asl | 109 ++++++++++++++++++++
7 files changed, 127 insertions(+), 284 deletions(-)
diff --git a/src/mainboard/intel/emeraldlake2/acpi/chromeos.asl b/src/mainboard/intel/emeraldlake2/acpi/chromeos.asl
index 6a61b0d..307e2e2 100644
--- a/src/mainboard/intel/emeraldlake2/acpi/chromeos.asl
+++ b/src/mainboard/intel/emeraldlake2/acpi/chromeos.asl
@@ -17,98 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-Device (CRHW)
-{
- Name(_HID, EISAID("GGL0001"))
-
- Method(_STA, 0, Serialized)
- {
- Return (0xb)
- }
-
- Method(CHSW, 0, Serialized)
- {
- Name (WSHC, Package() { VBT3 })
- Return (WSHC)
- }
-
- Method(FWID, 0, Serialized)
- {
- Name (DIW1, "")
- ToString(VBT5, 63, DIW1)
- Name (DIWF, Package() { DIW1 })
- Return(DIWF)
- }
-
- Method(FRID, 0, Serialized)
- {
- Name (DIR1, "")
- ToString(VBT6, 63, DIR1)
- Name (DIRF, Package() { DIR1 })
- Return (DIRF)
- }
-
- Method(HWID, 0, Serialized)
- {
- Name (DIW0, "")
- ToString(VBT4, 255, DIW0)
- Name (DIWH, Package() { DIW0 })
- Return (DIWH)
- }
-
- Method(BINF, 0, Serialized)
- {
- Name (FNIB, Package() { VBT0, VBT1, VBT2, VBT7, VBT8 })
- Return (FNIB)
- }
-
- Method(GPIO, 0, Serialized)
- {
- Name(OIPG, Package() {
- Package() { 0x001, 0, 22, "CougarPoint" }, // recovery button
- Package() { 0x002, 1, 57, "CougarPoint" }, // developer switch
- Package() { 0x003, 0, 48, "CougarPoint" }, // firmware write protect
- })
- Return (OIPG)
-
- }
-
- Method(VBNV, 0, Serialized)
- {
- Name(VNBV, Package() {
- // See src/vendorcode/google/chromeos/Kconfig
- // for the definition of these:
- CONFIG_VBNV_OFFSET,
- CONFIG_VBNV_SIZE
- })
- Return(VNBV)
- }
-
- Method(VDAT, 0, Serialized)
- {
- Name(TAD0,"")
- ToBuffer(CHVD, TAD0)
- Name (TADV, Package() { TAD0 })
- Return (TADV)
- }
-
- Method(FMAP, 0, Serialized)
- {
- Name(PAMF, Package() { VBT9 })
- Return(PAMF)
- }
-
- Method(MECK, 0, Serialized)
- {
- Name(HASH, Package() { MEHH })
- Return(HASH)
- }
-
- Method(MLST, 0, Serialized)
- {
- Name(TSLM, Package() { "CHSW", "FWID", "HWID", "FRID", "BINF",
- "GPIO", "VBNV", "VDAT", "FMAP", "MECK"
- })
- Return (TSLM)
- }
-}
+Name(OIPG, Package() {
+ Package() { 0x001, 0, 22, "CougarPoint" }, // recovery button
+ Package() { 0x002, 1, 57, "CougarPoint" }, // developer switch
+ Package() { 0x003, 0, 48, "CougarPoint" }, // firmware write protect
+})
diff --git a/src/mainboard/intel/emeraldlake2/dsdt.asl b/src/mainboard/intel/emeraldlake2/dsdt.asl
index 9af312a..b67082e 100644
--- a/src/mainboard/intel/emeraldlake2/dsdt.asl
+++ b/src/mainboard/intel/emeraldlake2/dsdt.asl
@@ -49,6 +49,7 @@ DefinitionBlock(
}
#include "acpi/chromeos.asl"
+ #include <vendorcode/google/chromeos/acpi/chromeos.asl>
/* Chipset specific sleep states */
#include <southbridge/intel/bd82x6x/acpi/sleepstates.asl>
diff --git a/src/mainboard/samsung/lumpy/acpi/chromeos.asl b/src/mainboard/samsung/lumpy/acpi/chromeos.asl
index fc7be20..fbe98c9 100644
--- a/src/mainboard/samsung/lumpy/acpi/chromeos.asl
+++ b/src/mainboard/samsung/lumpy/acpi/chromeos.asl
@@ -17,98 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-Device (CRHW)
-{
- Name(_HID, EISAID("GGL0001"))
+Name(OIPG, Package() {
+ Package() { 0x001, 0, 42, "CougarPoint" }, // recovery button
+ Package() { 0x002, 1, 17, "CougarPoint" }, // developer switch
+ Package() { 0x003, 1, 24, "CougarPoint" }, // firmware write protect
+})
- Method(_STA, 0, Serialized)
- {
- Return (0xb)
- }
-
- Method(CHSW, 0, Serialized)
- {
- Name (WSHC, Package() { VBT3 })
- Return (WSHC)
- }
-
- Method(FWID, 0, Serialized)
- {
- Name (DIW1, "")
- ToString(VBT5, 63, DIW1)
- Name (DIWF, Package() { DIW1 })
- Return(DIWF)
- }
-
- Method(FRID, 0, Serialized)
- {
- Name (DIR1, "")
- ToString(VBT6, 63, DIR1)
- Name (DIRF, Package() { DIR1 })
- Return (DIRF)
- }
-
- Method(HWID, 0, Serialized)
- {
- Name (DIW0, "")
- ToString(VBT4, 255, DIW0)
- Name (DIWH, Package() { DIW0 })
- Return (DIWH)
- }
-
- Method(BINF, 0, Serialized)
- {
- Name (FNIB, Package() { VBT0, VBT1, VBT2, VBT7, VBT8 })
- Return (FNIB)
- }
-
- Method(GPIO, 0, Serialized)
- {
- Name(OIPG, Package() {
- Package() { 0x001, 0, 42, "CougarPoint" }, // recovery button
- Package() { 0x002, 1, 17, "CougarPoint" }, // developer switch
- Package() { 0x003, 1, 24, "CougarPoint" }, // firmware write protect
- })
- Return (OIPG)
-
- }
-
- Method(VBNV, 0, Serialized)
- {
- Name(VNBV, Package() {
- // See src/vendorcode/google/chromeos/Kconfig
- // for the definition of these:
- CONFIG_VBNV_OFFSET,
- CONFIG_VBNV_SIZE
- })
- Return(VNBV)
- }
-
- Method(VDAT, 0, Serialized)
- {
- Name(TAD0,"")
- ToBuffer(CHVD, TAD0)
- Name (TADV, Package() { TAD0 })
- Return (TADV)
- }
-
- Method(FMAP, 0, Serialized)
- {
- Name(PAMF, Package() { VBT9 })
- Return(PAMF)
- }
-
- Method(MECK, 0, Serialized)
- {
- Name(HASH, Package() { MEHH })
- Return(HASH)
- }
-
- Method(MLST, 0, Serialized)
- {
- Name(TSLM, Package() { "CHSW", "FWID", "HWID", "FRID", "BINF",
- "GPIO", "VBNV", "VDAT", "FMAP", "MECK"
- })
- Return (TSLM)
- }
-}
diff --git a/src/mainboard/samsung/lumpy/dsdt.asl b/src/mainboard/samsung/lumpy/dsdt.asl
index 94adfda..c1c9685 100644
--- a/src/mainboard/samsung/lumpy/dsdt.asl
+++ b/src/mainboard/samsung/lumpy/dsdt.asl
@@ -52,6 +52,7 @@ DefinitionBlock(
}
#include "acpi/chromeos.asl"
+ #include <vendorcode/google/chromeos/acpi/chromeos.asl>
/* Chipset specific sleep states */
#include <southbridge/intel/bd82x6x/acpi/sleepstates.asl>
diff --git a/src/mainboard/samsung/stumpy/acpi/chromeos.asl b/src/mainboard/samsung/stumpy/acpi/chromeos.asl
index f517b16..739e0d4 100644
--- a/src/mainboard/samsung/stumpy/acpi/chromeos.asl
+++ b/src/mainboard/samsung/stumpy/acpi/chromeos.asl
@@ -17,98 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-Device (CRHW)
-{
- Name(_HID, EISAID("GGL0001"))
-
- Method(_STA, 0, Serialized)
- {
- Return (0xb)
- }
-
- Method(CHSW, 0, Serialized)
- {
- Name (WSHC, Package() { VBT3 })
- Return (WSHC)
- }
-
- Method(FWID, 0, Serialized)
- {
- Name (DIW1, "")
- ToString(VBT5, 63, DIW1)
- Name (DIWF, Package() { DIW1 })
- Return(DIWF)
- }
-
- Method(FRID, 0, Serialized)
- {
- Name (DIR1, "")
- ToString(VBT6, 63, DIR1)
- Name (DIRF, Package() { DIR1 })
- Return (DIRF)
- }
-
- Method(HWID, 0, Serialized)
- {
- Name (DIW0, "")
- ToString(VBT4, 255, DIW0)
- Name (DIWH, Package() { DIW0 })
- Return (DIWH)
- }
-
- Method(BINF, 0, Serialized)
- {
- Name (FNIB, Package() { VBT0, VBT1, VBT2, VBT7, VBT8 })
- Return (FNIB)
- }
-
- Method(GPIO, 0, Serialized)
- {
- Name(OIPG, Package() {
- Package() { 0x001, 0, 42, "CougarPoint" }, // recovery button
- Package() { 0x002, 1, 17, "CougarPoint" }, // developer switch
- Package() { 0x003, 1, 68, "CougarPoint" }, // firmware write protect
- })
- Return (OIPG)
-
- }
-
- Method(VBNV, 0, Serialized)
- {
- Name(VNBV, Package() {
- // See src/vendorcode/google/chromeos/Kconfig
- // for the definition of these:
- CONFIG_VBNV_OFFSET,
- CONFIG_VBNV_SIZE
- })
- Return(VNBV)
- }
-
- Method(VDAT, 0, Serialized)
- {
- Name(TAD0,"")
- ToBuffer(CHVD, TAD0)
- Name (TADV, Package() { TAD0 })
- Return (TADV)
- }
-
- Method(FMAP, 0, Serialized)
- {
- Name(PAMF, Package() { VBT9 })
- Return(PAMF)
- }
-
- Method(MECK, 0, Serialized)
- {
- Name(HASH, Package() { MEHH })
- Return(HASH)
- }
-
- Method(MLST, 0, Serialized)
- {
- Name(TSLM, Package() { "CHSW", "FWID", "HWID", "FRID", "BINF",
- "GPIO", "VBNV", "VDAT", "FMAP", "MECK"
- })
- Return (TSLM)
- }
-}
+Name(OIPG, Package() {
+ Package() { 0x001, 0, 42, "CougarPoint" }, // recovery button
+ Package() { 0x002, 1, 17, "CougarPoint" }, // developer switch
+ Package() { 0x003, 1, 68, "CougarPoint" }, // firmware write protect
+})
diff --git a/src/mainboard/samsung/stumpy/dsdt.asl b/src/mainboard/samsung/stumpy/dsdt.asl
index 63aa47e..608827a 100644
--- a/src/mainboard/samsung/stumpy/dsdt.asl
+++ b/src/mainboard/samsung/stumpy/dsdt.asl
@@ -50,6 +50,7 @@ DefinitionBlock(
}
#include "acpi/chromeos.asl"
+ #include <vendorcode/google/chromeos/acpi/chromeos.asl>
/* Chipset specific sleep states */
#include <southbridge/intel/bd82x6x/acpi/sleepstates.asl>
diff --git a/src/vendorcode/google/chromeos/acpi/chromeos.asl b/src/vendorcode/google/chromeos/acpi/chromeos.asl
new file mode 100644
index 0000000..278296c
--- /dev/null
+++ b/src/vendorcode/google/chromeos/acpi/chromeos.asl
@@ -0,0 +1,109 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved.
+ *
+ * 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
+ */
+
+Device (CRHW)
+{
+ Name(_HID, EISAID("GGL0001"))
+
+ Method(_STA, 0, Serialized)
+ {
+ Return (0xb)
+ }
+
+ Method(CHSW, 0, Serialized)
+ {
+ Name (WSHC, Package() { VBT3 })
+ Return (WSHC)
+ }
+
+ Method(FWID, 0, Serialized)
+ {
+ Name (DIW1, "")
+ ToString(VBT5, 63, DIW1)
+ Name (DIWF, Package() { DIW1 })
+ Return(DIWF)
+ }
+
+ Method(FRID, 0, Serialized)
+ {
+ Name (DIR1, "")
+ ToString(VBT6, 63, DIR1)
+ Name (DIRF, Package() { DIR1 })
+ Return (DIRF)
+ }
+
+ Method(HWID, 0, Serialized)
+ {
+ Name (DIW0, "")
+ ToString(VBT4, 255, DIW0)
+ Name (DIWH, Package() { DIW0 })
+ Return (DIWH)
+ }
+
+ Method(BINF, 0, Serialized)
+ {
+ Name (FNIB, Package() { VBT0, VBT1, VBT2, VBT7, VBT8 })
+ Return (FNIB)
+ }
+
+ Method(GPIO, 0, Serialized)
+ {
+ Return (OIPG)
+
+ }
+
+ Method(VBNV, 0, Serialized)
+ {
+ Name(VNBV, Package() {
+ // See src/vendorcode/google/chromeos/Kconfig
+ // for the definition of these:
+ CONFIG_VBNV_OFFSET,
+ CONFIG_VBNV_SIZE
+ })
+ Return(VNBV)
+ }
+
+ Method(VDAT, 0, Serialized)
+ {
+ Name(TAD0,"")
+ ToBuffer(CHVD, TAD0)
+ Name (TADV, Package() { TAD0 })
+ Return (TADV)
+ }
+
+ Method(FMAP, 0, Serialized)
+ {
+ Name(PAMF, Package() { VBT9 })
+ Return(PAMF)
+ }
+
+ Method(MECK, 0, Serialized)
+ {
+ Name(HASH, Package() { MEHH })
+ Return(HASH)
+ }
+
+ Method(MLST, 0, Serialized)
+ {
+ Name(TSLM, Package() { "CHSW", "FWID", "HWID", "FRID", "BINF",
+ "GPIO", "VBNV", "VDAT", "FMAP", "MECK"
+ })
+ Return (TSLM)
+ }
+}
More information about the coreboot
mailing list