4 files changed, 12 insertions, 189 deletions
diff --git a/src/mainboard/samsung/lumpy/acpi/chromeos.asl b/src/mainboard/samsung/lumpy/acpi/chromeos.asl
index fc7be2010e..fbe98c9755 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 94adfdaa3f..c1c968547d 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 f517b16b67..739e0d496b 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 63aa47e91c..608827aac1 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>