<p>Philipp Deppenwiese <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/22924">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Felix Held: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">opencellular/rotundu: Introduce variants for OC<br><br>* Add Supabrck v1 variant<br>* Modify rotundu base board<br><br>Change-Id: Id20e9d4ed7ac071d25a69eee63c9ec544d2ad152<br>Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org><br>Reviewed-on: https://review.coreboot.org/22924<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Felix Held <felix-coreboot@felixheld.de><br>---<br>M src/mainboard/opencellular/rotundu/Kconfig<br>M src/mainboard/opencellular/rotundu/Kconfig.name<br>M src/mainboard/opencellular/rotundu/Makefile.inc<br>R src/mainboard/opencellular/rotundu/variants/rotundu/devicetree.cb<br>R src/mainboard/opencellular/rotundu/variants/rotundu/gpio.c<br>C src/mainboard/opencellular/rotundu/variants/supabrckv1/devicetree.cb<br>C src/mainboard/opencellular/rotundu/variants/supabrckv1/gpio.c<br>7 files changed, 29 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/opencellular/rotundu/Kconfig b/src/mainboard/opencellular/rotundu/Kconfig</span><br><span>index e118ad5..9b50cef 100644</span><br><span>--- a/src/mainboard/opencellular/rotundu/Kconfig</span><br><span>+++ b/src/mainboard/opencellular/rotundu/Kconfig</span><br><span>@@ -15,10 +15,8 @@</span><br><span> ## GNU General Public License for more details.</span><br><span> ##</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if BOARD_OPENCELLULAR_ROTUNDU</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-config BOARD_SPECIFIC_OPTIONS # dummy</span><br><span style="color: hsl(0, 100%, 40%);">- def_bool y</span><br><span style="color: hsl(120, 100%, 40%);">+config BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU</span><br><span style="color: hsl(120, 100%, 40%);">+ def_bool n</span><br><span> select SOC_INTEL_FSP_BAYTRAIL</span><br><span> select BOARD_ROMSIZE_KB_16384</span><br><span> select HAVE_ACPI_TABLES</span><br><span>@@ -30,13 +28,26 @@</span><br><span> select USE_BLOBS</span><br><span> select HAVE_FSP_BIN if FSP_PACKAGE_DEFAULT</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-config MAINBOARD_DIR</span><br><span style="color: hsl(120, 100%, 40%);">+if BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config VARIANT_DIR</span><br><span> string</span><br><span style="color: hsl(0, 100%, 40%);">- default "opencellular/rotundu"</span><br><span style="color: hsl(120, 100%, 40%);">+ default "rotundu" if BOARD_OPENCELLULAR_ROTUNDU</span><br><span style="color: hsl(120, 100%, 40%);">+ default "supabrckv1" if BOARD_OPENCELLULAR_SUPABRCKV1</span><br><span> </span><br><span> config MAINBOARD_PART_NUMBER</span><br><span> string</span><br><span style="color: hsl(0, 100%, 40%);">- default "Rotundu"</span><br><span style="color: hsl(120, 100%, 40%);">+ default "Rotundu" if BOARD_OPENCELLULAR_ROTUNDU</span><br><span style="color: hsl(120, 100%, 40%);">+ default "Supabrck v1" if BOARD_OPENCELLULAR_SUPABRCKV1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config DEVICETREE</span><br><span style="color: hsl(120, 100%, 40%);">+ string</span><br><span style="color: hsl(120, 100%, 40%);">+ default "variants/rotundu/devicetree.cb" if BOARD_OPENCELLULAR_ROTUNDU</span><br><span style="color: hsl(120, 100%, 40%);">+ default "variants/supabrckv1/devicetree.cb" if BOARD_OPENCELLULAR_SUPABRCKV1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config MAINBOARD_DIR</span><br><span style="color: hsl(120, 100%, 40%);">+ string</span><br><span style="color: hsl(120, 100%, 40%);">+ default "opencellular/rotundu"</span><br><span> </span><br><span> config MAINBOARD_VENDOR</span><br><span> string</span><br><span>diff --git a/src/mainboard/opencellular/rotundu/Kconfig.name b/src/mainboard/opencellular/rotundu/Kconfig.name</span><br><span>index 3640ef6..1346b94 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,2 +1,7 @@</span><br><span> config BOARD_OPENCELLULAR_ROTUNDU</span><br><span style="color: hsl(0, 100%, 40%);">- bool "Rotundu"</span><br><span style="color: hsl(120, 100%, 40%);">+ bool "OpenCellular Rotundu (GBCv1)"</span><br><span style="color: hsl(120, 100%, 40%);">+ select BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config BOARD_OPENCELLULAR_SUPABRCKV1</span><br><span style="color: hsl(120, 100%, 40%);">+ bool "OpenCellular Supabrck V1 (BRCK)"</span><br><span style="color: hsl(120, 100%, 40%);">+ select BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU</span><br><span>diff --git a/src/mainboard/opencellular/rotundu/Makefile.inc b/src/mainboard/opencellular/rotundu/Makefile.inc</span><br><span>index 3074df2..2aee228 100644</span><br><span>--- a/src/mainboard/opencellular/rotundu/Makefile.inc</span><br><span>+++ b/src/mainboard/opencellular/rotundu/Makefile.inc</span><br><span>@@ -13,5 +13,7 @@</span><br><span> ## GNU General Public License for more details.</span><br><span> ##</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-y += gpio.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += variants/$(VARIANT_DIR)/gpio.c</span><br><span> ramstage-y += irqroute.c</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+subdirs-y += variants/$(VARIANT_DIR)</span><br><span>diff --git a/src/mainboard/opencellular/rotundu/devicetree.cb b/src/mainboard/opencellular/rotundu/variants/rotundu/devicetree.cb</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/opencellular/rotundu/devicetree.cb</span><br><span>rename to src/mainboard/opencellular/rotundu/variants/rotundu/devicetree.cb</span><br><span>diff --git a/src/mainboard/opencellular/rotundu/gpio.c b/src/mainboard/opencellular/rotundu/variants/rotundu/gpio.c</span><br><span>similarity index 99%</span><br><span>rename from src/mainboard/opencellular/rotundu/gpio.c</span><br><span>rename to src/mainboard/opencellular/rotundu/variants/rotundu/gpio.c</span><br><span>index a61b7c4..78d1ad6 100644</span><br><span>--- a/src/mainboard/opencellular/rotundu/gpio.c</span><br><span>+++ b/src/mainboard/opencellular/rotundu/variants/rotundu/gpio.c</span><br><span>@@ -17,7 +17,7 @@</span><br><span> </span><br><span> #include <stdlib.h></span><br><span> #include <soc/gpio.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include "irqroute.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "../../irqroute.h"</span><br><span> </span><br><span> /* NCORE GPIOs */</span><br><span> static const struct soc_gpio_map gpncore_gpio_map[] = {</span><br><span>diff --git a/src/mainboard/opencellular/rotundu/devicetree.cb b/src/mainboard/opencellular/rotundu/variants/supabrckv1/devicetree.cb</span><br><span>similarity index 100%</span><br><span>copy from src/mainboard/opencellular/rotundu/devicetree.cb</span><br><span>copy to src/mainboard/opencellular/rotundu/variants/supabrckv1/devicetree.cb</span><br><span>diff --git a/src/mainboard/opencellular/rotundu/gpio.c b/src/mainboard/opencellular/rotundu/variants/supabrckv1/gpio.c</span><br><span>similarity index 99%</span><br><span>copy from src/mainboard/opencellular/rotundu/gpio.c</span><br><span>copy to src/mainboard/opencellular/rotundu/variants/supabrckv1/gpio.c</span><br><span>index a61b7c4..78d1ad6 100644</span><br><span>--- a/src/mainboard/opencellular/rotundu/gpio.c</span><br><span>+++ b/src/mainboard/opencellular/rotundu/variants/supabrckv1/gpio.c</span><br><span>@@ -17,7 +17,7 @@</span><br><span> </span><br><span> #include <stdlib.h></span><br><span> #include <soc/gpio.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include "irqroute.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "../../irqroute.h"</span><br><span> </span><br><span> /* NCORE GPIOs */</span><br><span> static const struct soc_gpio_map gpncore_gpio_map[] = {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/22924">change 22924</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/22924"/><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: Id20e9d4ed7ac071d25a69eee63c9ec544d2ad152 </div>
<div style="display:none"> Gerrit-Change-Number: 22924 </div>
<div style="display:none"> Gerrit-PatchSet: 27 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: David Hendricks <david.hendricks@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Felix Held <felix-coreboot@felixheld.de> </div>
<div style="display:none"> Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net> </div>
<div style="display:none"> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Reg Orton <reg@brck.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>