[coreboot-gerrit] Change in coreboot[master]: google/kahlee/grunt: Move ASL to variants

[Marc Jones (Code Review)]

Marc Jones has uploaded this change for review. ( https://review.coreboot.org/23229


Change subject: google/kahlee/grunt: Move ASL to variants
......................................................................

google/kahlee/grunt: Move ASL to variants

Move the apci/ to the baseboard and move mainboard.asl to
each variant.

BUG=b:71873651
TEST=build
BRANCH=none

Change-Id: I8a829f2946e4b280cd78574eb8dbda6c2a9a1028
Signed-off-by: Marc Jones <marcj303 at gmail.com>
---
M src/mainboard/google/kahlee/dsdt.asl
R src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl
R src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl
R src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
R src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
A src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
R src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl
7 files changed, 62 insertions(+), 5 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/23229/1

diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl
index ff3bb73..8be64fc 100644
--- a/src/mainboard/google/kahlee/dsdt.asl
+++ b/src/mainboard/google/kahlee/dsdt.asl
@@ -31,7 +31,7 @@
 	#include <globalnvs.asl>
 
 	/* Globals for the platform */
-	#include "acpi/mainboard.asl"
+	#include <variant/acpi/mainboard.asl>
 
 	/* PCI IRQ mapping for the Southbridge */
 	#include <pcie.asl>
@@ -43,7 +43,7 @@
 	#include <sleepstates.asl>
 
 	/* Contains the Sleep methods (WAK, PTS, GTS, etc.) */
-	#include "acpi/sleep.asl"
+	#include <baseboard/acpi/sleep.asl>
 
 	/* System Bus */
 	Scope(\_SB) { /* Start \_SB scope */
@@ -51,7 +51,7 @@
 		#include <arch/x86/acpi/globutil.asl>
 
 		/* IRQ Routing mapping for this platform (in \_SB scope) */
-		#include "acpi/routing.asl"
+		#include <baseboard/acpi/routing.asl>
 
 		Device(PWRB) {
 			Name(_HID, EISAID("PNP0C0C"))
@@ -64,7 +64,7 @@
 	} /* End \_SB scope */
 
 	/* Thermal handler */
-	#include "acpi/thermal.asl"
+	#include <baseboard/acpi/thermal.asl>
 
 	/* Chrome OS specific */
 	#include <vendorcode/google/chromeos/acpi/chromeos.asl>
@@ -82,6 +82,6 @@
 	#include <smbus.asl>
 
 	/* Define the General Purpose Events for the platform */
-	#include "acpi/gpe.asl"
+	#include <baseboard/acpi/gpe.asl>
 }
 /* End of ASL file */
diff --git a/src/mainboard/google/kahlee/acpi/gpe.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl
similarity index 100%
rename from src/mainboard/google/kahlee/acpi/gpe.asl
rename to src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl
diff --git a/src/mainboard/google/kahlee/acpi/routing.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl
similarity index 100%
rename from src/mainboard/google/kahlee/acpi/routing.asl
rename to src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl
diff --git a/src/mainboard/google/kahlee/acpi/sleep.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
similarity index 100%
rename from src/mainboard/google/kahlee/acpi/sleep.asl
rename to src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
diff --git a/src/mainboard/google/kahlee/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
similarity index 100%
rename from src/mainboard/google/kahlee/acpi/thermal.asl
rename to src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
new file mode 100644
index 0000000..242eb92
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
@@ -0,0 +1,57 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2013 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+/* Memory related values */
+Name (LOMH, 0x0)	/* Start of unused memory in C0000-E0000 range */
+Name (PBAD, 0x0)	/* Address of BIOS area (If TOM2 != 0, Addr >> 16) */
+Name (PBLN, 0x0)	/* Length of BIOS area */
+
+/* Base address of PCIe config space */
+Name (PCBA, CONFIG_MMCONF_BASE_ADDRESS)
+
+/* Length of PCIe config space, 1MB each bus */
+Name (PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER))
+
+/* Base address of HPET table */
+Name (HPBA, 0xFED00000)
+
+/* Global Data */
+Name (OSVR, 3)		/* WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+Name (OSV, Ones)	/* Assume nothing */
+Name (PMOD, One)	/* Assume APIC */
+
+Device (ETPA)
+{
+	Name (_HID, "ELAN0000")
+	Name (_DDN, "Elan Touchpad")
+	Name (_UID, 1)
+	Name (ISTP, 1)	/* Touchpad */
+
+	Name (_CRS, ResourceTemplate()
+	{
+		I2cSerialBus (
+			0x15,			/* SlaveAddress */
+			ControllerInitiated,	/* SlaveMode */
+			400000,			/* ConnectionSpeed */
+			AddressingMode7Bit,	/* AddressingMode */
+			"\\_SB.I2CD",		/* ResourceSource */
+		)
+		GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,
+			"\\_SB.GPIO") { 0x5 }
+	})
+
+	/* Allow device to power off in S0 */
+	Name (_S0W, 3)
+}
diff --git a/src/mainboard/google/kahlee/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl
similarity index 100%
rename from src/mainboard/google/kahlee/acpi/mainboard.asl
rename to src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl

-- 
To view, visit https://review.coreboot.org/23229
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a829f2946e4b280cd78574eb8dbda6c2a9a1028
Gerrit-Change-Number: 23229
Gerrit-PatchSet: 1
Gerrit-Owner: Marc Jones <marc at marcjonesconsulting.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180112/35c24899/attachment-0001.html>