purism/librem13v2: convert to variant setup

Convert the Purism Librem13v2 board to a variant setup,
in preparation of adding the librem15v3 as a new variant.
The 13v2 and 15v3 are nearly identical, so this minimizes new
code to add support for the latter.

Change-Id: I5d648cdb8f63c03de5474253203b3d0853673294
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/22047
Reviewed-by: Youness Alaoui <snifikino@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/mainboard/purism/librem_skl/Kconfig

@@ -1,7 +1,5 @@
-if BOARD_PURISM_LIBREM13_V2
-
-config BOARD_SPECIFIC_OPTIONS # dummy
-	def_bool y
+config BOARD_PURISM_BASEBOARD_LIBREM_SKL
+	def_bool n
 	select SYSTEM_TYPE_LAPTOP
 	select BOARD_ROMSIZE_KB_16384
 	select HAVE_ACPI_RESUME
@@ -11,25 +9,39 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SERIRQ_CONTINUOUS_MODE
 	select MAINBOARD_USES_FSP2_0
 
+if BOARD_PURISM_BASEBOARD_LIBREM_SKL
+
 config IRQ_SLOT_COUNT
 	int
 	default 18
 
+config VARIANT_DIR
+	string
+	default "librem13v2" if BOARD_PURISM_LIBREM13_V2
+
+config MAINBOARD_VENDOR
+	string
+	default "Purism"
+
 config MAINBOARD_FAMILY
 	string
-	default "Librem 13"
+	default "Librem 13" if BOARD_PURISM_LIBREM13_V2
 
 config MAINBOARD_PART_NUMBER
 	string
-	default "Librem 13 v2"
+	default "Librem 13 v2" if BOARD_PURISM_LIBREM13_V2
 
 config MAINBOARD_VERSION
 	string
-	default "2.0"
+	default "2.0" if BOARD_PURISM_LIBREM13_V2
 
 config MAINBOARD_DIR
 	string
-	default "purism/librem13v2"
+	default "purism/librem_skl"
+
+config DEVICETREE
+	string
+	default "variants/librem13v2/devicetree.cb" if BOARD_PURISM_LIBREM13_V2
 
 config MAX_CPUS
 	int

src/mainboard/purism/librem_skl/Kconfig.name

@@ -1,2 +1,3 @@
 config BOARD_PURISM_LIBREM13_V2
 	bool "Librem 13 v2"
+	select BOARD_PURISM_BASEBOARD_LIBREM_SKL

src/mainboard/purism/librem_skl/Makefile.inc

@@ -18,3 +18,5 @@ romstage-y += pei_data.c
 ramstage-y += pei_data.c
 ramstage-y += ramstage.c
 ramstage-y += hda_verb.c
+
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include

src/mainboard/purism/librem_skl/board_info.txt

@@ -0,0 +1,8 @@
+Vendor name: Purism
+Board name: Librem Skylake baseboard
+Category: laptop
+ROM package: SOIC8
+ROM protocol: SPI
+ROM socketed: n
+Flashrom support: y
+Release year: 2017

src/mainboard/purism/librem_skl/ramstage.c

@@ -15,7 +15,7 @@
  */
 
 #include <soc/ramstage.h>
-#include "gpio.h"
+#include <variant/gpio.h>
 
 void mainboard_silicon_init_params(FSP_SIL_UPD *params)
 {