<p>Justin TerAvest has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27516">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/octopus: Create meep variant<br><br>This creates a meep variant for octopus.<br>The devicetree overrides are copied from yorp, otherwise everything<br>just defaults to baseboard settings.<br><br>BUG=b:111543000<br>TEST=None<br><br>Change-Id: I791f8d1589d7323fbe884dddf0f9d7362a41b9ac<br>Signed-off-by: Justin TerAvest <teravest@chromium.org><br>---<br>M src/mainboard/google/octopus/Kconfig<br>M src/mainboard/google/octopus/Kconfig.name<br>A src/mainboard/google/octopus/variants/meep/include/variant/acpi/dptf.asl<br>A src/mainboard/google/octopus/variants/meep/include/variant/ec.h<br>A src/mainboard/google/octopus/variants/meep/include/variant/gpio.h<br>A src/mainboard/google/octopus/variants/meep/overridetree.cb<br>6 files changed, 127 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/27516/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig</span><br><span>index 34ca725..dc58ec8 100644</span><br><span>--- a/src/mainboard/google/octopus/Kconfig</span><br><span>+++ b/src/mainboard/google/octopus/Kconfig</span><br><span>@@ -43,6 +43,7 @@</span><br><span> default "phaser" if BOARD_GOOGLE_PHASER</span><br><span> default "fleex" if BOARD_GOOGLE_FLEEX</span><br><span> default "bobba" if BOARD_GOOGLE_BOBBA</span><br><span style="color: hsl(120, 100%, 40%);">+ default "meep" if BOARD_GOOGLE_MEEP</span><br><span> default "octopus" if BOARD_GOOGLE_OCTOPUS</span><br><span> </span><br><span> config DEVICETREE</span><br><span>@@ -60,6 +61,7 @@</span><br><span> default "Phaser" if BOARD_GOOGLE_PHASER</span><br><span> default "Fleex" if BOARD_GOOGLE_FLEEX</span><br><span> default "Bobba" if BOARD_GOOGLE_BOBBA</span><br><span style="color: hsl(120, 100%, 40%);">+ default "Meep" if BOARD_GOOGLE_MEEP</span><br><span> default "Octopus" if BOARD_GOOGLE_OCTOPUS</span><br><span> </span><br><span> config MAINBOARD_FAMILY</span><br><span>@@ -74,6 +76,7 @@</span><br><span> default "PHASER TEST 7167" if BOARD_GOOGLE_PHASER</span><br><span> default "FLEEX TEST 7423" if BOARD_GOOGLE_FLEEX</span><br><span> default "BOBBA TEST 4516" if BOARD_GOOGLE_BOBBA</span><br><span style="color: hsl(120, 100%, 40%);">+ default "MEEP TEST 1118" if BOARD_GOOGLE_MEEP</span><br><span> default "OCTOPUS TEST 6859" if BOARD_GOOGLE_OCTOPUS</span><br><span> </span><br><span> config MAX_CPUS</span><br><span>diff --git a/src/mainboard/google/octopus/Kconfig.name b/src/mainboard/google/octopus/Kconfig.name</span><br><span>index cfe051c..4f6e5a5 100644</span><br><span>--- a/src/mainboard/google/octopus/Kconfig.name</span><br><span>+++ b/src/mainboard/google/octopus/Kconfig.name</span><br><span>@@ -37,3 +37,10 @@</span><br><span> select BOARD_GOOGLE_BASEBOARD_OCTOPUS</span><br><span> select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC if CHROMEOS</span><br><span> select NHLT_DA7219 if INCLUDE_NHLT_BLOBS</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config BOARD_GOOGLE_MEEP</span><br><span style="color: hsl(120, 100%, 40%);">+ bool "-> Meep"</span><br><span style="color: hsl(120, 100%, 40%);">+ select BASEBOARD_OCTOPUS_LAPTOP</span><br><span style="color: hsl(120, 100%, 40%);">+ select BOARD_GOOGLE_BASEBOARD_OCTOPUS</span><br><span style="color: hsl(120, 100%, 40%);">+ select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC if CHROMEOS</span><br><span style="color: hsl(120, 100%, 40%);">+ select NHLT_DA7219 if INCLUDE_NHLT_BLOBS</span><br><span>diff --git a/src/mainboard/google/octopus/variants/meep/include/variant/acpi/dptf.asl b/src/mainboard/google/octopus/variants/meep/include/variant/acpi/dptf.asl</span><br><span>new file mode 100644</span><br><span>index 0000000..cc17d56</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/octopus/variants/meep/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 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%);">+#include <baseboard/acpi/dptf.asl></span><br><span>diff --git a/src/mainboard/google/octopus/variants/meep/include/variant/ec.h b/src/mainboard/google/octopus/variants/meep/include/variant/ec.h</span><br><span>new file mode 100644</span><br><span>index 0000000..16f931b</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/octopus/variants/meep/include/variant/ec.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 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%);">+#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 <baseboard/ec.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span>diff --git a/src/mainboard/google/octopus/variants/meep/include/variant/gpio.h b/src/mainboard/google/octopus/variants/meep/include/variant/gpio.h</span><br><span>new file mode 100644</span><br><span>index 0000000..1fd1e11</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/octopus/variants/meep/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 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%);">+#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>diff --git a/src/mainboard/google/octopus/variants/meep/overridetree.cb b/src/mainboard/google/octopus/variants/meep/overridetree.cb</span><br><span>new file mode 100644</span><br><span>index 0000000..d29e6c1</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/octopus/variants/meep/overridetree.cb</span><br><span>@@ -0,0 +1,59 @@</span><br><span style="color: hsl(120, 100%, 40%);">+chip soc/intel/apollolake</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ device domain 0 on</span><br><span style="color: hsl(120, 100%, 40%);">+ device pci 16.0 on</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/i2c/hid</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.hid" = ""WCOM50C1""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.desc" = ""WCOM Digitizer""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_139_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_140)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.has_power_resource" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "hid_desc_reg_offset" = "0x1"</span><br><span style="color: hsl(120, 100%, 40%);">+ device i2c 0x9 on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ end # - I2C 0</span><br><span style="color: hsl(120, 100%, 40%);">+ device pci 17.1 on</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/i2c/da7219</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_137_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "btn_cfg" = "50"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "mic_det_thr" = "500"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "jack_ins_deb" = "20"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "jack_det_rate" = ""32ms_64ms""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "jack_rem_deb" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "a_d_btn_thr" = "0xa"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "d_b_btn_thr" = "0x16"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "b_c_btn_thr" = "0x21"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "c_mic_btn_thr" = "0x3e"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "btn_avg" = "4"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "adc_1bit_rpt" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "micbias_lvl" = "2600"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "mic_amp_in_sel" = ""diff""</span><br><span style="color: hsl(120, 100%, 40%);">+ device i2c 1a on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ end # - I2C 5</span><br><span style="color: hsl(120, 100%, 40%);">+ device pci 17.2 on</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/i2c/generic</span><br><span style="color: hsl(120, 100%, 40%);">+ register "hid" = ""ELAN0000""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "desc" = ""ELAN Touchpad""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "wake" = "GPE0_DW2_02"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "probed" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ device i2c 15 on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ end # - I2C 6</span><br><span style="color: hsl(120, 100%, 40%);">+ device pci 17.3 on</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/i2c/generic</span><br><span style="color: hsl(120, 100%, 40%);">+ register "hid" = ""ELAN0001""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "desc" = ""ELAN Touchscreen""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_212_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "probed" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_105)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "reset_delay_ms" = "20"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_213)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "enable_delay_ms" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "has_power_resource" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ device i2c 10 on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ end # - I2C 7</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+end</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27516">change 27516</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/27516"/><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: I791f8d1589d7323fbe884dddf0f9d7362a41b9ac </div>
<div style="display:none"> Gerrit-Change-Number: 27516 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Justin TerAvest <teravest@chromium.org> </div>