[coreboot-gerrit] Change in coreboot[master]: purism/librem13v2: convert to variant setup
Youness Alaoui (Code Review)
gerrit at coreboot.org
Mon Oct 16 19:13:25 CEST 2017
Hello Matt DeVillier,
I'd like you to do a code review. Please visit
https://review.coreboot.org/22047
to review the following change.
Change subject: purism/librem13v2: convert to variant setup
......................................................................
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 at gmail.com>
---
D src/mainboard/purism/librem13v2/Kconfig.name
R src/mainboard/purism/librem_skl/Kconfig
A src/mainboard/purism/librem_skl/Kconfig.name
R src/mainboard/purism/librem_skl/Makefile.inc
R src/mainboard/purism/librem_skl/acpi/ec.asl
R src/mainboard/purism/librem_skl/acpi/mainboard.asl
R src/mainboard/purism/librem_skl/acpi/superio.asl
R src/mainboard/purism/librem_skl/acpi_tables.c
A src/mainboard/purism/librem_skl/board_info.txt
R src/mainboard/purism/librem_skl/dsdt.asl
R src/mainboard/purism/librem_skl/hda_verb.c
R src/mainboard/purism/librem_skl/hda_verb.h
R src/mainboard/purism/librem_skl/mainboard.c
R src/mainboard/purism/librem_skl/pei_data.c
R src/mainboard/purism/librem_skl/pei_data.h
R src/mainboard/purism/librem_skl/ramstage.c
R src/mainboard/purism/librem_skl/romstage.c
R src/mainboard/purism/librem_skl/variants/librem13v2/board_info.txt
R src/mainboard/purism/librem_skl/variants/librem13v2/devicetree.cb
R src/mainboard/purism/librem_skl/variants/librem13v2/include/variant/gpio.h
20 files changed, 34 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/22047/1
diff --git a/src/mainboard/purism/librem13v2/Kconfig.name b/src/mainboard/purism/librem13v2/Kconfig.name
deleted file mode 100644
index 838f2b2..0000000
--- a/src/mainboard/purism/librem13v2/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_PURISM_LIBREM13_V2
- bool "Librem 13 v2"
diff --git a/src/mainboard/purism/librem13v2/Kconfig b/src/mainboard/purism/librem_skl/Kconfig
similarity index 63%
rename from src/mainboard/purism/librem13v2/Kconfig
rename to src/mainboard/purism/librem_skl/Kconfig
index 5a27955..de6b167 100644
--- a/src/mainboard/purism/librem13v2/Kconfig
+++ b/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 @@
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
diff --git a/src/mainboard/purism/librem_skl/Kconfig.name b/src/mainboard/purism/librem_skl/Kconfig.name
new file mode 100644
index 0000000..06fa372
--- /dev/null
+++ b/src/mainboard/purism/librem_skl/Kconfig.name
@@ -0,0 +1,3 @@
+config BOARD_PURISM_LIBREM13_V2
+ bool "Librem 13 v2"
+ select BOARD_PURISM_BASEBOARD_LIBREM_SKL
diff --git a/src/mainboard/purism/librem13v2/Makefile.inc b/src/mainboard/purism/librem_skl/Makefile.inc
similarity index 87%
rename from src/mainboard/purism/librem13v2/Makefile.inc
rename to src/mainboard/purism/librem_skl/Makefile.inc
index 5a7131f..18c9ad6 100644
--- a/src/mainboard/purism/librem13v2/Makefile.inc
+++ b/src/mainboard/purism/librem_skl/Makefile.inc
@@ -18,3 +18,5 @@
ramstage-y += pei_data.c
ramstage-y += ramstage.c
ramstage-y += hda_verb.c
+
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
diff --git a/src/mainboard/purism/librem13v2/acpi/ec.asl b/src/mainboard/purism/librem_skl/acpi/ec.asl
similarity index 100%
rename from src/mainboard/purism/librem13v2/acpi/ec.asl
rename to src/mainboard/purism/librem_skl/acpi/ec.asl
diff --git a/src/mainboard/purism/librem13v2/acpi/mainboard.asl b/src/mainboard/purism/librem_skl/acpi/mainboard.asl
similarity index 100%
rename from src/mainboard/purism/librem13v2/acpi/mainboard.asl
rename to src/mainboard/purism/librem_skl/acpi/mainboard.asl
diff --git a/src/mainboard/purism/librem13v2/acpi/superio.asl b/src/mainboard/purism/librem_skl/acpi/superio.asl
similarity index 100%
rename from src/mainboard/purism/librem13v2/acpi/superio.asl
rename to src/mainboard/purism/librem_skl/acpi/superio.asl
diff --git a/src/mainboard/purism/librem13v2/acpi_tables.c b/src/mainboard/purism/librem_skl/acpi_tables.c
similarity index 100%
rename from src/mainboard/purism/librem13v2/acpi_tables.c
rename to src/mainboard/purism/librem_skl/acpi_tables.c
diff --git a/src/mainboard/purism/librem_skl/board_info.txt b/src/mainboard/purism/librem_skl/board_info.txt
new file mode 100644
index 0000000..afc4244
--- /dev/null
+++ b/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
diff --git a/src/mainboard/purism/librem13v2/dsdt.asl b/src/mainboard/purism/librem_skl/dsdt.asl
similarity index 100%
rename from src/mainboard/purism/librem13v2/dsdt.asl
rename to src/mainboard/purism/librem_skl/dsdt.asl
diff --git a/src/mainboard/purism/librem13v2/hda_verb.c b/src/mainboard/purism/librem_skl/hda_verb.c
similarity index 100%
rename from src/mainboard/purism/librem13v2/hda_verb.c
rename to src/mainboard/purism/librem_skl/hda_verb.c
diff --git a/src/mainboard/purism/librem13v2/hda_verb.h b/src/mainboard/purism/librem_skl/hda_verb.h
similarity index 100%
rename from src/mainboard/purism/librem13v2/hda_verb.h
rename to src/mainboard/purism/librem_skl/hda_verb.h
diff --git a/src/mainboard/purism/librem13v2/mainboard.c b/src/mainboard/purism/librem_skl/mainboard.c
similarity index 100%
rename from src/mainboard/purism/librem13v2/mainboard.c
rename to src/mainboard/purism/librem_skl/mainboard.c
diff --git a/src/mainboard/purism/librem13v2/pei_data.c b/src/mainboard/purism/librem_skl/pei_data.c
similarity index 100%
rename from src/mainboard/purism/librem13v2/pei_data.c
rename to src/mainboard/purism/librem_skl/pei_data.c
diff --git a/src/mainboard/purism/librem13v2/pei_data.h b/src/mainboard/purism/librem_skl/pei_data.h
similarity index 100%
rename from src/mainboard/purism/librem13v2/pei_data.h
rename to src/mainboard/purism/librem_skl/pei_data.h
diff --git a/src/mainboard/purism/librem13v2/ramstage.c b/src/mainboard/purism/librem_skl/ramstage.c
similarity index 96%
rename from src/mainboard/purism/librem13v2/ramstage.c
rename to src/mainboard/purism/librem_skl/ramstage.c
index 7051714..dddeb91 100644
--- a/src/mainboard/purism/librem13v2/ramstage.c
+++ b/src/mainboard/purism/librem_skl/ramstage.c
@@ -16,7 +16,7 @@
*/
#include <soc/ramstage.h>
-#include "gpio.h"
+#include <variant/gpio.h>
void mainboard_silicon_init_params(FSP_SIL_UPD *params)
{
diff --git a/src/mainboard/purism/librem13v2/romstage.c b/src/mainboard/purism/librem_skl/romstage.c
similarity index 100%
rename from src/mainboard/purism/librem13v2/romstage.c
rename to src/mainboard/purism/librem_skl/romstage.c
diff --git a/src/mainboard/purism/librem13v2/board_info.txt b/src/mainboard/purism/librem_skl/variants/librem13v2/board_info.txt
similarity index 100%
rename from src/mainboard/purism/librem13v2/board_info.txt
rename to src/mainboard/purism/librem_skl/variants/librem13v2/board_info.txt
diff --git a/src/mainboard/purism/librem13v2/devicetree.cb b/src/mainboard/purism/librem_skl/variants/librem13v2/devicetree.cb
similarity index 100%
rename from src/mainboard/purism/librem13v2/devicetree.cb
rename to src/mainboard/purism/librem_skl/variants/librem13v2/devicetree.cb
diff --git a/src/mainboard/purism/librem13v2/gpio.h b/src/mainboard/purism/librem_skl/variants/librem13v2/include/variant/gpio.h
similarity index 100%
rename from src/mainboard/purism/librem13v2/gpio.h
rename to src/mainboard/purism/librem_skl/variants/librem13v2/include/variant/gpio.h
--
To view, visit https://review.coreboot.org/22047
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d648cdb8f63c03de5474253203b3d0853673294
Gerrit-Change-Number: 22047
Gerrit-PatchSet: 1
Gerrit-Owner: Youness Alaoui <snifikino at gmail.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20171016/fd2f4936/attachment-0001.html>
More information about the coreboot-gerrit
mailing list