<p>Philipp Deppenwiese has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28335">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OC fixes WIP<br><br>Change-Id: I1ccd0c28e05f5d57f0c2a7575021efbe4ba1c570<br>Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org><br>---<br>M src/mainboard/opencellular/Kconfig<br>M src/mainboard/opencellular/Kconfig.name<br>M src/mainboard/opencellular/elgon/Kconfig<br>M src/mainboard/opencellular/elgon/Kconfig.name<br>M src/mainboard/opencellular/elgon/Makefile.inc<br>M src/mainboard/opencellular/rotundu/Kconfig<br>M src/mainboard/opencellular/rotundu/Kconfig.name<br>M src/soc/cavium/cn81xx/soc.c<br>8 files changed, 10 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/28335/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/opencellular/Kconfig b/src/mainboard/opencellular/Kconfig</span><br><span>index 2df6ba3..1a80c3f 100644</span><br><span>--- a/src/mainboard/opencellular/Kconfig</span><br><span>+++ b/src/mainboard/opencellular/Kconfig</span><br><span>@@ -25,6 +25,6 @@</span><br><span> </span><br><span> config MAINBOARD_VENDOR</span><br><span>    string</span><br><span style="color: hsl(0, 100%, 40%);">-  default "OpenCellular"</span><br><span style="color: hsl(120, 100%, 40%);">+      default "Open Cellular"</span><br><span> </span><br><span> endif # VENDOR_OPENCELLULAR</span><br><span>diff --git a/src/mainboard/opencellular/Kconfig.name b/src/mainboard/opencellular/Kconfig.name</span><br><span>index c65882f..fbbca76 100644</span><br><span>--- a/src/mainboard/opencellular/Kconfig.name</span><br><span>+++ b/src/mainboard/opencellular/Kconfig.name</span><br><span>@@ -1,2 +1,2 @@</span><br><span> config VENDOR_OPENCELLULAR</span><br><span style="color: hsl(0, 100%, 40%);">-   bool "OpenCellular"</span><br><span style="color: hsl(120, 100%, 40%);">+ bool "Open Cellular"</span><br><span>diff --git a/src/mainboard/opencellular/elgon/Kconfig b/src/mainboard/opencellular/elgon/Kconfig</span><br><span>index bd35e9c..37a020a 100644</span><br><span>--- a/src/mainboard/opencellular/elgon/Kconfig</span><br><span>+++ b/src/mainboard/opencellular/elgon/Kconfig</span><br><span>@@ -42,10 +42,6 @@</span><br><span>     string</span><br><span>       default "opencellular/elgon"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-config MAINBOARD_VENDOR</span><br><span style="color: hsl(0, 100%, 40%);">-       string</span><br><span style="color: hsl(0, 100%, 40%);">-  default "Open Cellular"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> config DRIVER_TPM_I2C_BUS</span><br><span>       hex</span><br><span>  default 0x1</span><br><span>@@ -91,4 +87,8 @@</span><br><span>      string</span><br><span>       default "Elgon"</span><br><span> </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%);">+        default "gbcv2.dts"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> endif</span><br><span>diff --git a/src/mainboard/opencellular/elgon/Kconfig.name b/src/mainboard/opencellular/elgon/Kconfig.name</span><br><span>index e0c4290..7d02111 100644</span><br><span>--- a/src/mainboard/opencellular/elgon/Kconfig.name</span><br><span>+++ b/src/mainboard/opencellular/elgon/Kconfig.name</span><br><span>@@ -1,2 +1,2 @@</span><br><span> config BOARD_OPENCELLULAR_ELGON</span><br><span style="color: hsl(0, 100%, 40%);">-  bool "Elgon"</span><br><span style="color: hsl(120, 100%, 40%);">+        bool "Elgon (GBCv2)"</span><br><span>diff --git a/src/mainboard/opencellular/elgon/Makefile.inc b/src/mainboard/opencellular/elgon/Makefile.inc</span><br><span>index 26de1cc..343a52e 100644</span><br><span>--- a/src/mainboard/opencellular/elgon/Makefile.inc</span><br><span>+++ b/src/mainboard/opencellular/elgon/Makefile.inc</span><br><span>@@ -29,13 +29,3 @@</span><br><span> </span><br><span> verstage-y += memlayout.ld</span><br><span> verstage-y += death.c</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-MB_DIR = src/mainboard/$(MAINBOARDDIR)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-LINUX_DTB = gbcv2.dtb</span><br><span style="color: hsl(0, 100%, 40%);">-build/$(LINUX_DTB):</span><br><span style="color: hsl(0, 100%, 40%);">-   dtc -p 4096 -I dts -O dtb -o build/$(LINUX_DTB) -i $(MB_DIR) $(MB_DIR)/$(patsubst %.dtb,%.dts,$(LINUX_DTB))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-cbfs-files-y += $(LINUX_DTB)</span><br><span style="color: hsl(0, 100%, 40%);">-$(LINUX_DTB)-file := build/$(LINUX_DTB)</span><br><span style="color: hsl(0, 100%, 40%);">-$(LINUX_DTB)-type := raw</span><br><span>diff --git a/src/mainboard/opencellular/rotundu/Kconfig b/src/mainboard/opencellular/rotundu/Kconfig</span><br><span>index edacf0d..4164768 100644</span><br><span>--- a/src/mainboard/opencellular/rotundu/Kconfig</span><br><span>+++ b/src/mainboard/opencellular/rotundu/Kconfig</span><br><span>@@ -66,10 +66,6 @@</span><br><span>     string</span><br><span>       default "opencellular/rotundu"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-config MAINBOARD_VENDOR</span><br><span style="color: hsl(0, 100%, 40%);">-     string</span><br><span style="color: hsl(0, 100%, 40%);">-  default "OpenCellular"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> config MAX_CPUS</span><br><span>  int</span><br><span>  default 16</span><br><span>diff --git a/src/mainboard/opencellular/rotundu/Kconfig.name b/src/mainboard/opencellular/rotundu/Kconfig.name</span><br><span>index 1346b94..37df2e2 100644</span><br><span>--- a/src/mainboard/opencellular/rotundu/Kconfig.name</span><br><span>+++ b/src/mainboard/opencellular/rotundu/Kconfig.name</span><br><span>@@ -1,7 +1,7 @@</span><br><span> config BOARD_OPENCELLULAR_ROTUNDU</span><br><span style="color: hsl(0, 100%, 40%);">-      bool "OpenCellular Rotundu (GBCv1)"</span><br><span style="color: hsl(120, 100%, 40%);">+ bool "Rotundu (GBCv1)"</span><br><span>     select BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU</span><br><span> </span><br><span> config BOARD_OPENCELLULAR_SUPABRCKV1</span><br><span style="color: hsl(0, 100%, 40%);">- bool "OpenCellular Supabrck V1 (BRCK)"</span><br><span style="color: hsl(120, 100%, 40%);">+      bool "Supabrck V1 (BRCK)"</span><br><span>  select BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU</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/28335">change 28335</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/28335"/><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: I1ccd0c28e05f5d57f0c2a7575021efbe4ba1c570 </div>
<div style="display:none"> Gerrit-Change-Number: 28335 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>