<p>Philipp Deppenwiese has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28336">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/cavium: Add dynamic dtb support<br><br>* Add a kconfig variable containing the per board<br>  dts name.<br>* Add auto generation of device tree (DTB) file if<br>  kconfig option is set in the mainboard implementation.<br>* Fix cavium/cn81xx for dynamic device tree loading.<br><br>Change-Id: Ie470092e424b86e04141b8e2bd2b080a5aadcf58<br>Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org><br>---<br>M Makefile.inc<br>M src/mainboard/Kconfig<br>M src/soc/cavium/cn81xx/soc.c<br>3 files changed, 26 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/28336/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.inc b/Makefile.inc</span><br><span>index 7ce2360..455e058 100644</span><br><span>--- a/Makefile.inc</span><br><span>+++ b/Makefile.inc</span><br><span>@@ -568,6 +568,26 @@</span><br><span> smm-y+=$(DEVICETREE_STATIC_C)</span><br><span> </span><br><span> #######################################################################</span><br><span style="color: hsl(120, 100%, 40%);">+# needed objects that every mainboard uses</span><br><span style="color: hsl(120, 100%, 40%);">+# Creation of these is architecture and mainboard independent</span><br><span style="color: hsl(120, 100%, 40%);">+FIT_DEVICETREE_NAME := $(call strip_quotes,$(CONFIG_MAINBOARD_FIT_DTS))</span><br><span style="color: hsl(120, 100%, 40%);">+FIT_DEVICETREE_FILE := $(src)/mainboard/$(MAINBOARDDIR)/$(FIT_DEVICETREE_NAME)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ifneq ($(FIT_DEVICETREE_NAME),)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+FIT_DEVICETREE := $(obj)/fit.dtb</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+$(FIT_DEVICETREE): $(FIT_DEVICETREE_FILE)</span><br><span style="color: hsl(120, 100%, 40%);">+     @printf "    DTC    $(subst $(src)/,,$(<))\n"</span><br><span style="color: hsl(120, 100%, 40%);">+    dtc -I dts -O dtb -o $@ -i $(src)/mainboard/$(MAINBOARDDIR) -i $(src)/mainboard/$(VARIANT_DIR) $<</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+cbfs-files-y += $(FIT_DEVICETREE_NAME)</span><br><span style="color: hsl(120, 100%, 40%);">+$(FIT_DEVICETREE_NAME)-file := $(FIT_DEVICETREE)</span><br><span style="color: hsl(120, 100%, 40%);">+$(FIT_DEVICETREE_NAME)-type := raw</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#######################################################################</span><br><span> # Clean up rules</span><br><span> clean-abuild:</span><br><span>        rm -rf coreboot-builds</span><br><span>diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig</span><br><span>index 04dca4a..f8f3bff 100644</span><br><span>--- a/src/mainboard/Kconfig</span><br><span>+++ b/src/mainboard/Kconfig</span><br><span>@@ -180,3 +180,8 @@</span><br><span> config ENABLE_POWER_BUTTON</span><br><span>  def_bool y if !POWER_BUTTON_IS_OPTIONAL && POWER_BUTTON_FORCE_ENABLE</span><br><span>         def_bool n if !POWER_BUTTON_IS_OPTIONAL && POWER_BUTTON_FORCE_DISABLE</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config MAINBOARD_FIT_DTS</span><br><span style="color: hsl(120, 100%, 40%);">+     string</span><br><span style="color: hsl(120, 100%, 40%);">+        help</span><br><span style="color: hsl(120, 100%, 40%);">+    Set the FIT payload supported FIT device tree per mainboard.</span><br><span>diff --git a/src/soc/cavium/cn81xx/soc.c b/src/soc/cavium/cn81xx/soc.c</span><br><span>index 8efcb13..0d10f4e 100644</span><br><span>--- a/src/soc/cavium/cn81xx/soc.c</span><br><span>+++ b/src/soc/cavium/cn81xx/soc.c</span><br><span>@@ -327,7 +327,7 @@</span><br><span> </span><br><span>    size_t size = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    void *ptr = cbfs_boot_map_with_leak("sff8104-linux.dtb",</span><br><span style="color: hsl(120, 100%, 40%);">+    void *ptr = cbfs_boot_map_with_leak(CONFIG_MAINBOARD_FIT_DTS,</span><br><span>                                            CBFS_TYPE_RAW, &size);</span><br><span>       if (ptr)</span><br><span>             memcpy(_sff8104, ptr, size);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28336">change 28336</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/28336"/><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: Ie470092e424b86e04141b8e2bd2b080a5aadcf58 </div>
<div style="display:none"> Gerrit-Change-Number: 28336 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>