<p>Youness Alaoui has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26183">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">purism/librem_bdl: Convert to variant setup<br><br>Convert the purism/librem13v1 to a variant setup, in<br>preparation for adding the librem15v2 board as a new variant.<br>The Librem 13 v1 and Librem 15 v2 are nearly identical, so<br>this minimizes new code to add support for the latter.<br><br>Also update the URL in board_info to an archive.org link.<br><br>Change-Id: I00bb82b9e895e2464ddaa92915c01ce0e35933a2<br>Signed-off-by: Youness Alaoui <youness.alaoui@puri.sm><br>---<br>D src/mainboard/purism/librem13v1/Kconfig.name<br>R src/mainboard/purism/librem_bdl/Kconfig<br>A src/mainboard/purism/librem_bdl/Kconfig.name<br>R src/mainboard/purism/librem_bdl/Makefile.inc<br>R src/mainboard/purism/librem_bdl/acpi/ec.asl<br>R src/mainboard/purism/librem_bdl/acpi/mainboard.asl<br>R src/mainboard/purism/librem_bdl/acpi/superio.asl<br>R src/mainboard/purism/librem_bdl/acpi_tables.c<br>R src/mainboard/purism/librem_bdl/board_info.txt<br>R src/mainboard/purism/librem_bdl/dsdt.asl<br>R src/mainboard/purism/librem_bdl/fadt.c<br>R src/mainboard/purism/librem_bdl/gpio.h<br>R src/mainboard/purism/librem_bdl/hda_verb.c<br>R src/mainboard/purism/librem_bdl/mainboard.c<br>R src/mainboard/purism/librem_bdl/romstage.c<br>C src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt<br>R src/mainboard/purism/librem_bdl/variants/librem13v1/devicetree.cb<br>R src/mainboard/purism/librem_bdl/variants/librem13v1/pei_data.c<br>18 files changed, 33 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/26183/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/purism/librem13v1/Kconfig.name b/src/mainboard/purism/librem13v1/Kconfig.name</span><br><span>deleted file mode 100644</span><br><span>index c32690c..0000000</span><br><span>--- a/src/mainboard/purism/librem13v1/Kconfig.name</span><br><span>+++ /dev/null</span><br><span>@@ -1,2 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-config BOARD_PURISM_LIBREM13_V1</span><br><span style="color: hsl(0, 100%, 40%);">-  bool "Librem 13 v1"</span><br><span>diff --git a/src/mainboard/purism/librem13v1/Kconfig b/src/mainboard/purism/librem_bdl/Kconfig</span><br><span>similarity index 61%</span><br><span>rename from src/mainboard/purism/librem13v1/Kconfig</span><br><span>rename to src/mainboard/purism/librem_bdl/Kconfig</span><br><span>index c4fb14b..63863ca 100644</span><br><span>--- a/src/mainboard/purism/librem13v1/Kconfig</span><br><span>+++ b/src/mainboard/purism/librem_bdl/Kconfig</span><br><span>@@ -1,7 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-if BOARD_PURISM_LIBREM13_V1</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_PURISM_BASEBOARD_LIBREM_BDL</span><br><span style="color: hsl(120, 100%, 40%);">+  def_bool n</span><br><span>   select SYSTEM_TYPE_LAPTOP</span><br><span>    select BOARD_ROMSIZE_KB_8192</span><br><span>         select EC_PURISM_LIBREM</span><br><span>@@ -10,6 +8,16 @@</span><br><span>  select INTEL_INT15</span><br><span>   select SOC_INTEL_BROADWELL</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if BOARD_PURISM_BASEBOARD_LIBREM_BDL</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config VARIANT_DIR</span><br><span style="color: hsl(120, 100%, 40%);">+    string</span><br><span style="color: hsl(120, 100%, 40%);">+        default "librem13v1" if BOARD_PURISM_LIBREM13_V1</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/librem13v1/devicetree.cb" if BOARD_PURISM_LIBREM13_V1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config DRIVERS_PS2_KEYBOARD</span><br><span>   def_bool y</span><br><span>   help</span><br><span>@@ -37,11 +45,23 @@</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span>       string</span><br><span style="color: hsl(0, 100%, 40%);">-  default purism/librem13v1</span><br><span style="color: hsl(120, 100%, 40%);">+     default purism/librem_bdl</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config MAINBOARD_VENDOR</span><br><span style="color: hsl(120, 100%, 40%);">+  string</span><br><span style="color: hsl(120, 100%, 40%);">+        default "Purism"</span><br><span> </span><br><span> config MAINBOARD_PART_NUMBER</span><br><span>       string</span><br><span style="color: hsl(0, 100%, 40%);">-  default "Librem 13 v1"</span><br><span style="color: hsl(120, 100%, 40%);">+      default "Librem 13 v1" if BOARD_PURISM_LIBREM13_V1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config MAINBOARD_FAMILY</span><br><span style="color: hsl(120, 100%, 40%);">+       string</span><br><span style="color: hsl(120, 100%, 40%);">+        default "Librem 13" if BOARD_PURISM_LIBREM13_V1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config MAINBOARD_VERSION</span><br><span style="color: hsl(120, 100%, 40%);">+ string</span><br><span style="color: hsl(120, 100%, 40%);">+        default "1.0" if BOARD_PURISM_LIBREM13_V1</span><br><span> </span><br><span> config MAX_CPUS</span><br><span>   int</span><br><span>diff --git a/src/mainboard/purism/librem_bdl/Kconfig.name b/src/mainboard/purism/librem_bdl/Kconfig.name</span><br><span>new file mode 100644</span><br><span>index 0000000..498c6ef</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/purism/librem_bdl/Kconfig.name</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+config BOARD_PURISM_LIBREM13_V1</span><br><span style="color: hsl(120, 100%, 40%);">+        bool "Librem 13 v1"</span><br><span style="color: hsl(120, 100%, 40%);">+ select BOARD_PURISM_BASEBOARD_LIBREM_BDL</span><br><span>diff --git a/src/mainboard/purism/librem13v1/Makefile.inc b/src/mainboard/purism/librem_bdl/Makefile.inc</span><br><span>similarity index 84%</span><br><span>rename from src/mainboard/purism/librem13v1/Makefile.inc</span><br><span>rename to src/mainboard/purism/librem_bdl/Makefile.inc</span><br><span>index 44e79c3..293e186 100644</span><br><span>--- a/src/mainboard/purism/librem13v1/Makefile.inc</span><br><span>+++ b/src/mainboard/purism/librem_bdl/Makefile.inc</span><br><span>@@ -13,5 +13,5 @@</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%);">-romstage-y += pei_data.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-y += pei_data.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += variants/$(VARIANT_DIR)/pei_data.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += variants/$(VARIANT_DIR)/pei_data.c</span><br><span>diff --git a/src/mainboard/purism/librem13v1/acpi/ec.asl b/src/mainboard/purism/librem_bdl/acpi/ec.asl</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/purism/librem13v1/acpi/ec.asl</span><br><span>rename to src/mainboard/purism/librem_bdl/acpi/ec.asl</span><br><span>diff --git a/src/mainboard/purism/librem13v1/acpi/mainboard.asl b/src/mainboard/purism/librem_bdl/acpi/mainboard.asl</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/purism/librem13v1/acpi/mainboard.asl</span><br><span>rename to src/mainboard/purism/librem_bdl/acpi/mainboard.asl</span><br><span>diff --git a/src/mainboard/purism/librem13v1/acpi/superio.asl b/src/mainboard/purism/librem_bdl/acpi/superio.asl</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/purism/librem13v1/acpi/superio.asl</span><br><span>rename to src/mainboard/purism/librem_bdl/acpi/superio.asl</span><br><span>diff --git a/src/mainboard/purism/librem13v1/acpi_tables.c b/src/mainboard/purism/librem_bdl/acpi_tables.c</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/purism/librem13v1/acpi_tables.c</span><br><span>rename to src/mainboard/purism/librem_bdl/acpi_tables.c</span><br><span>diff --git a/src/mainboard/purism/librem13v1/board_info.txt b/src/mainboard/purism/librem_bdl/board_info.txt</span><br><span>similarity index 67%</span><br><span>rename from src/mainboard/purism/librem13v1/board_info.txt</span><br><span>rename to src/mainboard/purism/librem_bdl/board_info.txt</span><br><span>index caaa9d9..99b05e7 100644</span><br><span>--- a/src/mainboard/purism/librem13v1/board_info.txt</span><br><span>+++ b/src/mainboard/purism/librem_bdl/board_info.txt</span><br><span>@@ -1,7 +1,6 @@</span><br><span> Category: laptop</span><br><span> Vendor name: Purism</span><br><span style="color: hsl(0, 100%, 40%);">-Board name: Librem 13 v1</span><br><span style="color: hsl(0, 100%, 40%);">-Board URL: https://puri.sm/librem-13/</span><br><span style="color: hsl(120, 100%, 40%);">+Board name: Librem Broadwell baseboard</span><br><span> ROM package: SOIC8</span><br><span> ROM protocol: SPI</span><br><span> ROM socketed: n</span><br><span>diff --git a/src/mainboard/purism/librem13v1/dsdt.asl b/src/mainboard/purism/librem_bdl/dsdt.asl</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/purism/librem13v1/dsdt.asl</span><br><span>rename to src/mainboard/purism/librem_bdl/dsdt.asl</span><br><span>diff --git a/src/mainboard/purism/librem13v1/fadt.c b/src/mainboard/purism/librem_bdl/fadt.c</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/purism/librem13v1/fadt.c</span><br><span>rename to src/mainboard/purism/librem_bdl/fadt.c</span><br><span>diff --git a/src/mainboard/purism/librem13v1/gpio.h b/src/mainboard/purism/librem_bdl/gpio.h</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/purism/librem13v1/gpio.h</span><br><span>rename to src/mainboard/purism/librem_bdl/gpio.h</span><br><span>diff --git a/src/mainboard/purism/librem13v1/hda_verb.c b/src/mainboard/purism/librem_bdl/hda_verb.c</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/purism/librem13v1/hda_verb.c</span><br><span>rename to src/mainboard/purism/librem_bdl/hda_verb.c</span><br><span>diff --git a/src/mainboard/purism/librem13v1/mainboard.c b/src/mainboard/purism/librem_bdl/mainboard.c</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/purism/librem13v1/mainboard.c</span><br><span>rename to src/mainboard/purism/librem_bdl/mainboard.c</span><br><span>diff --git a/src/mainboard/purism/librem13v1/romstage.c b/src/mainboard/purism/librem_bdl/romstage.c</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/purism/librem13v1/romstage.c</span><br><span>rename to src/mainboard/purism/librem_bdl/romstage.c</span><br><span>diff --git a/src/mainboard/purism/librem13v1/board_info.txt b/src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt</span><br><span>similarity index 65%</span><br><span>copy from src/mainboard/purism/librem13v1/board_info.txt</span><br><span>copy to src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt</span><br><span>index caaa9d9..2e4dfd9 100644</span><br><span>--- a/src/mainboard/purism/librem13v1/board_info.txt</span><br><span>+++ b/src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt</span><br><span>@@ -1,7 +1,7 @@</span><br><span> Category: laptop</span><br><span> Vendor name: Purism</span><br><span> Board name: Librem 13 v1</span><br><span style="color: hsl(0, 100%, 40%);">-Board URL: https://puri.sm/librem-13/</span><br><span style="color: hsl(120, 100%, 40%);">+Board URL: https://web.archive.org/web/20161018125457/https://puri.sm/librem-13</span><br><span> ROM package: SOIC8</span><br><span> ROM protocol: SPI</span><br><span> ROM socketed: n</span><br><span>diff --git a/src/mainboard/purism/librem13v1/devicetree.cb b/src/mainboard/purism/librem_bdl/variants/librem13v1/devicetree.cb</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/purism/librem13v1/devicetree.cb</span><br><span>rename to src/mainboard/purism/librem_bdl/variants/librem13v1/devicetree.cb</span><br><span>diff --git a/src/mainboard/purism/librem13v1/pei_data.c b/src/mainboard/purism/librem_bdl/variants/librem13v1/pei_data.c</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/purism/librem13v1/pei_data.c</span><br><span>rename to src/mainboard/purism/librem_bdl/variants/librem13v1/pei_data.c</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26183">change 26183</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/26183"/><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: I00bb82b9e895e2464ddaa92915c01ce0e35933a2 </div>
<div style="display:none"> Gerrit-Change-Number: 26183 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Youness Alaoui <snifikino@gmail.com> </div>