<p>Patrick Georgi <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/27804">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Furquan Shaikh: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/poppy/variants/rammus: change build directory to rammus<br><br>Move the build board directory from poppy to rammus.<br><br>BUG=b:111579386<br>BRANCH=Master<br>TEST=Build pass<br><br>Change-Id: I3a9fc2bbfe7261661f0c5c073baff0ff1434d09f<br>Signed-off-by: Zhuohao Lee <zhuohao@chromium.org><br>Reviewed-on: https://review.coreboot.org/27804<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Furquan Shaikh <furquan@google.com><br>---<br>M src/mainboard/google/poppy/Kconfig<br>M src/mainboard/google/poppy/Kconfig.name<br>A src/mainboard/google/poppy/variants/rammus/Makefile.inc<br>A src/mainboard/google/poppy/variants/rammus/include/variant/acpi/dptf.asl<br>A src/mainboard/google/poppy/variants/rammus/include/variant/ec.h<br>A src/mainboard/google/poppy/variants/rammus/include/variant/gpio.h<br>6 files changed, 131 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig</span><br><span>index 06501f7..9a75d9c 100644</span><br><span>--- a/src/mainboard/google/poppy/Kconfig</span><br><span>+++ b/src/mainboard/google/poppy/Kconfig</span><br><span>@@ -129,7 +129,7 @@</span><br><span> default "nami" if BOARD_GOOGLE_NAMI</span><br><span> default "nautilus" if BOARD_GOOGLE_NAUTILUS</span><br><span> default "nocturne" if BOARD_GOOGLE_NOCTURNE</span><br><span style="color: hsl(0, 100%, 40%);">- default "poppy" if BOARD_GOOGLE_RAMMUS</span><br><span style="color: hsl(120, 100%, 40%);">+ default "rammus" if BOARD_GOOGLE_RAMMUS</span><br><span> default "soraka" if BOARD_GOOGLE_SORAKA</span><br><span> </span><br><span> # Select this option to enable camera ACPI support on the variant.</span><br><span>@@ -183,6 +183,11 @@</span><br><span> select VARIANT_HAS_CAMERA_ACPI</span><br><span> select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config VARIANT_SPECIFIC_OPTIONS_RAMMUS</span><br><span style="color: hsl(120, 100%, 40%);">+ def_bool n</span><br><span style="color: hsl(120, 100%, 40%);">+ select CHROMEOS_WIFI_SAR if CHROMEOS</span><br><span style="color: hsl(120, 100%, 40%);">+ select MAINBOARD_HAS_SPI_TPM_CR50</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config VARIANT_SPECIFIC_OPTIONS_SORAKA</span><br><span> def_bool n</span><br><span> select DRIVERS_I2C_MAX98927</span><br><span>diff --git a/src/mainboard/google/poppy/Kconfig.name b/src/mainboard/google/poppy/Kconfig.name</span><br><span>index 67f1870..c33d7fb 100644</span><br><span>--- a/src/mainboard/google/poppy/Kconfig.name</span><br><span>+++ b/src/mainboard/google/poppy/Kconfig.name</span><br><span>@@ -28,7 +28,7 @@</span><br><span> config BOARD_GOOGLE_RAMMUS</span><br><span> bool "-> Rammus"</span><br><span> select BOARD_GOOGLE_BASEBOARD_POPPY</span><br><span style="color: hsl(0, 100%, 40%);">- select VARIANT_SPECIFIC_OPTIONS_POPPY</span><br><span style="color: hsl(120, 100%, 40%);">+ select VARIANT_SPECIFIC_OPTIONS_RAMMUS</span><br><span> </span><br><span> config BOARD_GOOGLE_SORAKA</span><br><span> bool "-> Soraka"</span><br><span>diff --git a/src/mainboard/google/poppy/variants/rammus/Makefile.inc b/src/mainboard/google/poppy/variants/rammus/Makefile.inc</span><br><span>new file mode 100644</span><br><span>index 0000000..f24f8a7</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/poppy/variants/rammus/Makefile.inc</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES = empty # 0b0000</span><br><span>diff --git a/src/mainboard/google/poppy/variants/rammus/include/variant/acpi/dptf.asl b/src/mainboard/google/poppy/variants/rammus/include/variant/acpi/dptf.asl</span><br><span>new file mode 100644</span><br><span>index 0000000..a9afa73</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/poppy/variants/rammus/include/variant/acpi/dptf.asl</span><br><span>@@ -0,0 +1,16 @@</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 2018 Google Inc.</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%);">+#include <baseboard/acpi/dptf.asl></span><br><span>diff --git a/src/mainboard/google/poppy/variants/rammus/include/variant/ec.h b/src/mainboard/google/poppy/variants/rammus/include/variant/ec.h</span><br><span>new file mode 100644</span><br><span>index 0000000..b22fccb</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/poppy/variants/rammus/include/variant/ec.h</span><br><span>@@ -0,0 +1,86 @@</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 2018 Google Inc.</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%);">+#ifndef __MAINBOARD_EC_H__</span><br><span style="color: hsl(120, 100%, 40%);">+#define __MAINBOARD_EC_H__</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <ec/ec.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <ec/google/chromeec/ec_commands.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <variant/gpio.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define MAINBOARD_EC_SCI_EVENTS \</span><br><span style="color: hsl(120, 100%, 40%);">+ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_LOW) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_CRITICAL) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_STATUS) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_THRESHOLD) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define MAINBOARD_EC_SMI_EVENTS \</span><br><span style="color: hsl(120, 100%, 40%);">+ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* EC can wake from S5 with lid or power button */</span><br><span style="color: hsl(120, 100%, 40%);">+#define MAINBOARD_EC_S5_WAKE_EVENTS \</span><br><span style="color: hsl(120, 100%, 40%);">+ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))</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%);">+ * EC can wake from S3 with lid or power button or key press or</span><br><span style="color: hsl(120, 100%, 40%);">+ * mode change event.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+#define MAINBOARD_EC_S3_WAKE_EVENTS \</span><br><span style="color: hsl(120, 100%, 40%);">+ (MAINBOARD_EC_S5_WAKE_EVENTS |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEY_PRESSED))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define MAINBOARD_EC_S0IX_WAKE_EVENTS (MAINBOARD_EC_S3_WAKE_EVENTS)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Log EC wake events plus EC shutdown events */</span><br><span style="color: hsl(120, 100%, 40%);">+#define MAINBOARD_EC_LOG_EVENTS \</span><br><span style="color: hsl(120, 100%, 40%);">+ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_SHUTDOWN) |\</span><br><span style="color: hsl(120, 100%, 40%);">+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_PANIC))</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%);">+ * ACPI related definitions for ASL code.</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%);">+/* Enable EC backed PD MCU device in ACPI */</span><br><span style="color: hsl(120, 100%, 40%);">+#define EC_ENABLE_PD_MCU_DEVICE</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Enable LID switch and provide wake pin for EC */</span><br><span style="color: hsl(120, 100%, 40%);">+#define EC_ENABLE_LID_SWITCH</span><br><span style="color: hsl(120, 100%, 40%);">+#define EC_ENABLE_WAKE_PIN GPE_EC_WAKE</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Enable Tablet switch */</span><br><span style="color: hsl(120, 100%, 40%);">+#define EC_ENABLE_TABLET_EVENT</span><br><span style="color: hsl(120, 100%, 40%);">+#define EC_ENABLE_TBMC_DEVICE</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */</span><br><span style="color: hsl(120, 100%, 40%);">+#define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */</span><br><span style="color: hsl(120, 100%, 40%);">+#define SIO_EC_ENABLE_PS2K /* Enable PS/2 Keyboard */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Enable EC backed Keyboard Backlight in ACPI */</span><br><span style="color: hsl(120, 100%, 40%);">+#define EC_ENABLE_KEYBOARD_BACKLIGHT</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* __MAINBOARD_EC_H__ */</span><br><span>diff --git a/src/mainboard/google/poppy/variants/rammus/include/variant/gpio.h b/src/mainboard/google/poppy/variants/rammus/include/variant/gpio.h</span><br><span>new file mode 100644</span><br><span>index 0000000..cd34cf0</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/poppy/variants/rammus/include/variant/gpio.h</span><br><span>@@ -0,0 +1,21 @@</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 2018 Google Inc.</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%);">+#ifndef __MAINBOARD_GPIO_H__</span><br><span style="color: hsl(120, 100%, 40%);">+#define __MAINBOARD_GPIO_H__</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <baseboard/gpio.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* __MAINBOARD_GPIO_H__ */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27804">change 27804</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/27804"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3a9fc2bbfe7261661f0c5c073baff0ff1434d09f </div>
<div style="display:none"> Gerrit-Change-Number: 27804 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Zhuohao Lee <zhuohao@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Furquan Shaikh <furquan@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>