<p>Furquan Shaikh has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29242">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/fizz: Enable use of override devicetree<br><br>This change enables override device tree for Fizz to allow variants to<br>provide their own overrides and also moves I2C5 realtek node to<br>fizz/overridetree.cb since it doesn't apply to some variants being<br>added for Fizz.<br><br>Change-Id: Ia1a069fc539b51a22882ef94b55baf5bf7cd302f<br>Signed-off-by: Furquan Shaikh <furquan@google.com><br>---<br>M src/mainboard/google/fizz/Kconfig<br>M src/mainboard/google/fizz/variants/baseboard/devicetree.cb<br>A src/mainboard/google/fizz/variants/fizz/overridetree.cb<br>3 files changed, 21 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/29242/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig</span><br><span>index 6ab94c9..c82f809 100644</span><br><span>--- a/src/mainboard/google/fizz/Kconfig</span><br><span>+++ b/src/mainboard/google/fizz/Kconfig</span><br><span>@@ -29,6 +29,10 @@</span><br><span> string</span><br><span> default "variants/baseboard/devicetree.cb"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config OVERRIDE_DEVICETREE</span><br><span style="color: hsl(120, 100%, 40%);">+ string</span><br><span style="color: hsl(120, 100%, 40%);">+ default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config VBOOT</span><br><span> select EC_GOOGLE_CHROMEEC_SWITCHES</span><br><span> select VBOOT_EC_EFS</span><br><span>diff --git a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb</span><br><span>index 281d65c..ff0db37 100644</span><br><span>--- a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb</span><br><span>+++ b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb</span><br><span>@@ -418,15 +418,7 @@</span><br><span> device pci 16.4 off end # Management Engine Interface 3</span><br><span> device pci 17.0 on end # SATA</span><br><span> device pci 19.0 on end # UART #2</span><br><span style="color: hsl(0, 100%, 40%);">- device pci 19.1 on</span><br><span style="color: hsl(0, 100%, 40%);">- chip drivers/i2c/generic</span><br><span style="color: hsl(0, 100%, 40%);">- register "hid" = ""10EC5663""</span><br><span style="color: hsl(0, 100%, 40%);">- register "name" = ""RT53""</span><br><span style="color: hsl(0, 100%, 40%);">- register "desc" = ""Realtek RT5663""</span><br><span style="color: hsl(0, 100%, 40%);">- register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_D9)"</span><br><span style="color: hsl(0, 100%, 40%);">- device i2c 13 on end</span><br><span style="color: hsl(0, 100%, 40%);">- end</span><br><span style="color: hsl(0, 100%, 40%);">- end # I2C #5</span><br><span style="color: hsl(120, 100%, 40%);">+ device pci 19.1 on end # I2C #5</span><br><span> device pci 19.2 off end # I2C #4</span><br><span> device pci 1c.0 on end # PCI Express Port 1</span><br><span> device pci 1c.1 off end # PCI Express Port 2</span><br><span>diff --git a/src/mainboard/google/fizz/variants/fizz/overridetree.cb b/src/mainboard/google/fizz/variants/fizz/overridetree.cb</span><br><span>new file mode 100644</span><br><span>index 0000000..0d3c4fc</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/fizz/variants/fizz/overridetree.cb</span><br><span>@@ -0,0 +1,16 @@</span><br><span style="color: hsl(120, 100%, 40%);">+chip soc/intel/skylake</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 19.1 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" = ""10EC5663""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "name" = ""RT53""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "desc" = ""Realtek RT5663""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_D9)"</span><br><span style="color: hsl(120, 100%, 40%);">+ device i2c 13 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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+</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/29242">change 29242</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/29242"/><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: Ia1a069fc539b51a22882ef94b55baf5bf7cd302f </div>
<div style="display:none"> Gerrit-Change-Number: 29242 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Furquan Shaikh <furquan@google.com> </div>