<p>Marc Jones has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23229">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/kahlee/grunt: Move ASL to variants<br><br>Move the apci/ to the baseboard and move mainboard.asl to<br>each variant.<br><br>BUG=b:71873651<br>TEST=build<br>BRANCH=none<br><br>Change-Id: I8a829f2946e4b280cd78574eb8dbda6c2a9a1028<br>Signed-off-by: Marc Jones <marcj303@gmail.com><br>---<br>M src/mainboard/google/kahlee/dsdt.asl<br>R src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl<br>R src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl<br>R src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl<br>R src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl<br>A src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl<br>R src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl<br>7 files changed, 62 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/23229/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl</span><br><span>index ff3bb73..8be64fc 100644</span><br><span>--- a/src/mainboard/google/kahlee/dsdt.asl</span><br><span>+++ b/src/mainboard/google/kahlee/dsdt.asl</span><br><span>@@ -31,7 +31,7 @@</span><br><span> #include <globalnvs.asl></span><br><span> </span><br><span> /* Globals for the platform */</span><br><span style="color: hsl(0, 100%, 40%);">- #include "acpi/mainboard.asl"</span><br><span style="color: hsl(120, 100%, 40%);">+ #include <variant/acpi/mainboard.asl></span><br><span> </span><br><span> /* PCI IRQ mapping for the Southbridge */</span><br><span> #include <pcie.asl></span><br><span>@@ -43,7 +43,7 @@</span><br><span> #include <sleepstates.asl></span><br><span> </span><br><span> /* Contains the Sleep methods (WAK, PTS, GTS, etc.) */</span><br><span style="color: hsl(0, 100%, 40%);">- #include "acpi/sleep.asl"</span><br><span style="color: hsl(120, 100%, 40%);">+ #include <baseboard/acpi/sleep.asl></span><br><span> </span><br><span> /* System Bus */</span><br><span> Scope(\_SB) { /* Start \_SB scope */</span><br><span>@@ -51,7 +51,7 @@</span><br><span> #include <arch/x86/acpi/globutil.asl></span><br><span> </span><br><span> /* IRQ Routing mapping for this platform (in \_SB scope) */</span><br><span style="color: hsl(0, 100%, 40%);">- #include "acpi/routing.asl"</span><br><span style="color: hsl(120, 100%, 40%);">+ #include <baseboard/acpi/routing.asl></span><br><span> </span><br><span> Device(PWRB) {</span><br><span> Name(_HID, EISAID("PNP0C0C"))</span><br><span>@@ -64,7 +64,7 @@</span><br><span> } /* End \_SB scope */</span><br><span> </span><br><span> /* Thermal handler */</span><br><span style="color: hsl(0, 100%, 40%);">- #include "acpi/thermal.asl"</span><br><span style="color: hsl(120, 100%, 40%);">+ #include <baseboard/acpi/thermal.asl></span><br><span> </span><br><span> /* Chrome OS specific */</span><br><span> #include <vendorcode/google/chromeos/acpi/chromeos.asl></span><br><span>@@ -82,6 +82,6 @@</span><br><span> #include <smbus.asl></span><br><span> </span><br><span> /* Define the General Purpose Events for the platform */</span><br><span style="color: hsl(0, 100%, 40%);">- #include "acpi/gpe.asl"</span><br><span style="color: hsl(120, 100%, 40%);">+ #include <baseboard/acpi/gpe.asl></span><br><span> }</span><br><span> /* End of ASL file */</span><br><span>diff --git a/src/mainboard/google/kahlee/acpi/gpe.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/acpi/gpe.asl</span><br><span>rename to src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl</span><br><span>diff --git a/src/mainboard/google/kahlee/acpi/routing.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/acpi/routing.asl</span><br><span>rename to src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl</span><br><span>diff --git a/src/mainboard/google/kahlee/acpi/sleep.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/acpi/sleep.asl</span><br><span>rename to src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl</span><br><span>diff --git a/src/mainboard/google/kahlee/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/acpi/thermal.asl</span><br><span>rename to src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl</span><br><span>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</span><br><span>new file mode 100644</span><br><span>index 0000000..242eb92</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl</span><br><span>@@ -0,0 +1,57 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2013 Sage Electronic Engineering, LLC</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Memory related values */</span><br><span style="color: hsl(120, 100%, 40%);">+Name (LOMH, 0x0) /* Start of unused memory in C0000-E0000 range */</span><br><span style="color: hsl(120, 100%, 40%);">+Name (PBAD, 0x0) /* Address of BIOS area (If TOM2 != 0, Addr >> 16) */</span><br><span style="color: hsl(120, 100%, 40%);">+Name (PBLN, 0x0) /* Length of BIOS area */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Base address of PCIe config space */</span><br><span style="color: hsl(120, 100%, 40%);">+Name (PCBA, CONFIG_MMCONF_BASE_ADDRESS)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Length of PCIe config space, 1MB each bus */</span><br><span style="color: hsl(120, 100%, 40%);">+Name (PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Base address of HPET table */</span><br><span style="color: hsl(120, 100%, 40%);">+Name (HPBA, 0xFED00000)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Global Data */</span><br><span style="color: hsl(120, 100%, 40%);">+Name (OSVR, 3) /* WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */</span><br><span style="color: hsl(120, 100%, 40%);">+Name (OSV, Ones) /* Assume nothing */</span><br><span style="color: hsl(120, 100%, 40%);">+Name (PMOD, One) /* Assume APIC */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Device (ETPA)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_HID, "ELAN0000")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_DDN, "Elan Touchpad")</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_UID, 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (ISTP, 1) /* Touchpad */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_CRS, ResourceTemplate()</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ I2cSerialBus (</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x15, /* SlaveAddress */</span><br><span style="color: hsl(120, 100%, 40%);">+ ControllerInitiated, /* SlaveMode */</span><br><span style="color: hsl(120, 100%, 40%);">+ 400000, /* ConnectionSpeed */</span><br><span style="color: hsl(120, 100%, 40%);">+ AddressingMode7Bit, /* AddressingMode */</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.I2CD", /* ResourceSource */</span><br><span style="color: hsl(120, 100%, 40%);">+ )</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.GPIO") { 0x5 }</span><br><span style="color: hsl(120, 100%, 40%);">+ })</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Allow device to power off in S0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (_S0W, 3)</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/mainboard/google/kahlee/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/acpi/mainboard.asl</span><br><span>rename to src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23229">change 23229</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23229"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I8a829f2946e4b280cd78574eb8dbda6c2a9a1028 </div>
<div style="display:none"> Gerrit-Change-Number: 23229 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marc Jones <marc@marcjonesconsulting.com> </div>