<p>Youness Alaoui would like Matt DeVillier to <strong>review</strong> this change.</p><p><a href="https://review.coreboot.org/22047">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">purism/librem13v2: convert to variant setup<br><br>Convert the Purism Librem13v2 board to a variant setup,<br>in preparation of adding the librem15v3 as a new variant.<br>The 13v2 and 15v3 are nearly identical, so this minimizes new<br>code to add support for the latter.<br><br>Change-Id: I5d648cdb8f63c03de5474253203b3d0853673294<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>D src/mainboard/purism/librem13v2/Kconfig.name<br>R src/mainboard/purism/librem_skl/Kconfig<br>A src/mainboard/purism/librem_skl/Kconfig.name<br>R src/mainboard/purism/librem_skl/Makefile.inc<br>R src/mainboard/purism/librem_skl/acpi/ec.asl<br>R src/mainboard/purism/librem_skl/acpi/mainboard.asl<br>R src/mainboard/purism/librem_skl/acpi/superio.asl<br>R src/mainboard/purism/librem_skl/acpi_tables.c<br>A src/mainboard/purism/librem_skl/board_info.txt<br>R src/mainboard/purism/librem_skl/dsdt.asl<br>R src/mainboard/purism/librem_skl/hda_verb.c<br>R src/mainboard/purism/librem_skl/hda_verb.h<br>R src/mainboard/purism/librem_skl/mainboard.c<br>R src/mainboard/purism/librem_skl/pei_data.c<br>R src/mainboard/purism/librem_skl/pei_data.h<br>R src/mainboard/purism/librem_skl/ramstage.c<br>R src/mainboard/purism/librem_skl/romstage.c<br>R src/mainboard/purism/librem_skl/variants/librem13v2/board_info.txt<br>R src/mainboard/purism/librem_skl/variants/librem13v2/devicetree.cb<br>R src/mainboard/purism/librem_skl/variants/librem13v2/include/variant/gpio.h<br>20 files changed, 34 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/22047/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/purism/librem13v2/Kconfig.name b/src/mainboard/purism/librem13v2/Kconfig.name<br>deleted file mode 100644<br>index 838f2b2..0000000<br>--- a/src/mainboard/purism/librem13v2/Kconfig.name<br>+++ /dev/null<br>@@ -1,2 +0,0 @@<br>-config BOARD_PURISM_LIBREM13_V2<br>- bool "Librem 13 v2"<br>diff --git a/src/mainboard/purism/librem13v2/Kconfig b/src/mainboard/purism/librem_skl/Kconfig<br>similarity index 63%<br>rename from src/mainboard/purism/librem13v2/Kconfig<br>rename to src/mainboard/purism/librem_skl/Kconfig<br>index 5a27955..de6b167 100644<br>--- a/src/mainboard/purism/librem13v2/Kconfig<br>+++ b/src/mainboard/purism/librem_skl/Kconfig<br>@@ -1,7 +1,5 @@<br>-if BOARD_PURISM_LIBREM13_V2<br>-<br>-config BOARD_SPECIFIC_OPTIONS # dummy<br>- def_bool y<br>+config BOARD_PURISM_BASEBOARD_LIBREM_SKL<br>+ def_bool n<br> select SYSTEM_TYPE_LAPTOP<br> select BOARD_ROMSIZE_KB_16384<br> select HAVE_ACPI_RESUME<br>@@ -11,25 +9,39 @@<br> select SERIRQ_CONTINUOUS_MODE<br> select MAINBOARD_USES_FSP2_0<br> <br>+if BOARD_PURISM_BASEBOARD_LIBREM_SKL<br>+<br> config IRQ_SLOT_COUNT<br> int<br> default 18<br> <br>+config VARIANT_DIR<br>+ string<br>+ default "librem13v2" if BOARD_PURISM_LIBREM13_V2<br>+<br>+config MAINBOARD_VENDOR<br>+ string<br>+ default "Purism"<br>+<br> config MAINBOARD_FAMILY<br> string<br>- default "Librem 13"<br>+ default "Librem 13" if BOARD_PURISM_LIBREM13_V2<br> <br> config MAINBOARD_PART_NUMBER<br> string<br>- default "Librem 13 v2"<br>+ default "Librem 13 v2" if BOARD_PURISM_LIBREM13_V2<br> <br> config MAINBOARD_VERSION<br> string<br>- default "2.0"<br>+ default "2.0" if BOARD_PURISM_LIBREM13_V2<br> <br> config MAINBOARD_DIR<br> string<br>- default "purism/librem13v2"<br>+ default "purism/librem_skl"<br>+<br>+config DEVICETREE<br>+ string<br>+ default "variants/librem13v2/devicetree.cb" if BOARD_PURISM_LIBREM13_V2<br> <br> config MAX_CPUS<br> int<br>diff --git a/src/mainboard/purism/librem_skl/Kconfig.name b/src/mainboard/purism/librem_skl/Kconfig.name<br>new file mode 100644<br>index 0000000..06fa372<br>--- /dev/null<br>+++ b/src/mainboard/purism/librem_skl/Kconfig.name<br>@@ -0,0 +1,3 @@<br>+config BOARD_PURISM_LIBREM13_V2<br>+ bool "Librem 13 v2"<br>+ select BOARD_PURISM_BASEBOARD_LIBREM_SKL<br>diff --git a/src/mainboard/purism/librem13v2/Makefile.inc b/src/mainboard/purism/librem_skl/Makefile.inc<br>similarity index 87%<br>rename from src/mainboard/purism/librem13v2/Makefile.inc<br>rename to src/mainboard/purism/librem_skl/Makefile.inc<br>index 5a7131f..18c9ad6 100644<br>--- a/src/mainboard/purism/librem13v2/Makefile.inc<br>+++ b/src/mainboard/purism/librem_skl/Makefile.inc<br>@@ -18,3 +18,5 @@<br> ramstage-y += pei_data.c<br> ramstage-y += ramstage.c<br> ramstage-y += hda_verb.c<br>+<br>+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include<br>diff --git a/src/mainboard/purism/librem13v2/acpi/ec.asl b/src/mainboard/purism/librem_skl/acpi/ec.asl<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/acpi/ec.asl<br>rename to src/mainboard/purism/librem_skl/acpi/ec.asl<br>diff --git a/src/mainboard/purism/librem13v2/acpi/mainboard.asl b/src/mainboard/purism/librem_skl/acpi/mainboard.asl<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/acpi/mainboard.asl<br>rename to src/mainboard/purism/librem_skl/acpi/mainboard.asl<br>diff --git a/src/mainboard/purism/librem13v2/acpi/superio.asl b/src/mainboard/purism/librem_skl/acpi/superio.asl<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/acpi/superio.asl<br>rename to src/mainboard/purism/librem_skl/acpi/superio.asl<br>diff --git a/src/mainboard/purism/librem13v2/acpi_tables.c b/src/mainboard/purism/librem_skl/acpi_tables.c<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/acpi_tables.c<br>rename to src/mainboard/purism/librem_skl/acpi_tables.c<br>diff --git a/src/mainboard/purism/librem_skl/board_info.txt b/src/mainboard/purism/librem_skl/board_info.txt<br>new file mode 100644<br>index 0000000..afc4244<br>--- /dev/null<br>+++ b/src/mainboard/purism/librem_skl/board_info.txt<br>@@ -0,0 +1,8 @@<br>+Vendor name: Purism<br>+Board name: Librem Skylake baseboard<br>+Category: laptop<br>+ROM package: SOIC8<br>+ROM protocol: SPI<br>+ROM socketed: n<br>+Flashrom support: y<br>+Release year: 2017<br>diff --git a/src/mainboard/purism/librem13v2/dsdt.asl b/src/mainboard/purism/librem_skl/dsdt.asl<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/dsdt.asl<br>rename to src/mainboard/purism/librem_skl/dsdt.asl<br>diff --git a/src/mainboard/purism/librem13v2/hda_verb.c b/src/mainboard/purism/librem_skl/hda_verb.c<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/hda_verb.c<br>rename to src/mainboard/purism/librem_skl/hda_verb.c<br>diff --git a/src/mainboard/purism/librem13v2/hda_verb.h b/src/mainboard/purism/librem_skl/hda_verb.h<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/hda_verb.h<br>rename to src/mainboard/purism/librem_skl/hda_verb.h<br>diff --git a/src/mainboard/purism/librem13v2/mainboard.c b/src/mainboard/purism/librem_skl/mainboard.c<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/mainboard.c<br>rename to src/mainboard/purism/librem_skl/mainboard.c<br>diff --git a/src/mainboard/purism/librem13v2/pei_data.c b/src/mainboard/purism/librem_skl/pei_data.c<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/pei_data.c<br>rename to src/mainboard/purism/librem_skl/pei_data.c<br>diff --git a/src/mainboard/purism/librem13v2/pei_data.h b/src/mainboard/purism/librem_skl/pei_data.h<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/pei_data.h<br>rename to src/mainboard/purism/librem_skl/pei_data.h<br>diff --git a/src/mainboard/purism/librem13v2/ramstage.c b/src/mainboard/purism/librem_skl/ramstage.c<br>similarity index 96%<br>rename from src/mainboard/purism/librem13v2/ramstage.c<br>rename to src/mainboard/purism/librem_skl/ramstage.c<br>index 7051714..dddeb91 100644<br>--- a/src/mainboard/purism/librem13v2/ramstage.c<br>+++ b/src/mainboard/purism/librem_skl/ramstage.c<br>@@ -16,7 +16,7 @@<br> */<br> <br> #include <soc/ramstage.h><br>-#include "gpio.h"<br>+#include <variant/gpio.h><br> <br> void mainboard_silicon_init_params(FSP_SIL_UPD *params)<br> {<br>diff --git a/src/mainboard/purism/librem13v2/romstage.c b/src/mainboard/purism/librem_skl/romstage.c<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/romstage.c<br>rename to src/mainboard/purism/librem_skl/romstage.c<br>diff --git a/src/mainboard/purism/librem13v2/board_info.txt b/src/mainboard/purism/librem_skl/variants/librem13v2/board_info.txt<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/board_info.txt<br>rename to src/mainboard/purism/librem_skl/variants/librem13v2/board_info.txt<br>diff --git a/src/mainboard/purism/librem13v2/devicetree.cb b/src/mainboard/purism/librem_skl/variants/librem13v2/devicetree.cb<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/devicetree.cb<br>rename to src/mainboard/purism/librem_skl/variants/librem13v2/devicetree.cb<br>diff --git a/src/mainboard/purism/librem13v2/gpio.h b/src/mainboard/purism/librem_skl/variants/librem13v2/include/variant/gpio.h<br>similarity index 100%<br>rename from src/mainboard/purism/librem13v2/gpio.h<br>rename to src/mainboard/purism/librem_skl/variants/librem13v2/include/variant/gpio.h<br></pre><p>To view, visit <a href="https://review.coreboot.org/22047">change 22047</a>. To unsubscribe, 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/22047"/><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: I5d648cdb8f63c03de5474253203b3d0853673294 </div>
<div style="display:none"> Gerrit-Change-Number: 22047 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Youness Alaoui <snifikino@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Matt DeVillier <matt.devillier@gmail.com> </div>