summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorYouness Alaoui <youness.alaoui@puri.sm>2018-05-08 19:19:13 -0400
committerPatrick Georgi <pgeorgi@google.com>2018-05-11 09:08:18 +0000
commitb799e0df3d7d090884f5c1163804a17c93530599 (patch)
treee5e06b1307cc2e4cec7ca81dbea87f616ae14d67 /src/mainboard
parent96184e9f2d911bb8346b90bb2052b7da090b533b (diff)
downloadcoreboot-b799e0df3d7d090884f5c1163804a17c93530599.tar.xz
purism/librem_bdl: Convert to variant setup
Convert the purism/librem13v1 to a variant setup, in preparation for adding the librem15v2 board as a new variant. The Librem 13 v1 and Librem 15 v2 are nearly identical, so this minimizes new code to add support for the latter. Also update the URL in board_info to an archive.org link. Change-Id: I00bb82b9e895e2464ddaa92915c01ce0e35933a2 Signed-off-by: Youness Alaoui <youness.alaoui@puri.sm> Reviewed-on: https://review.coreboot.org/26183 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/purism/librem_bdl/Kconfig (renamed from src/mainboard/purism/librem13v1/Kconfig)32
-rw-r--r--src/mainboard/purism/librem_bdl/Kconfig.name (renamed from src/mainboard/purism/librem13v1/Kconfig.name)1
-rw-r--r--src/mainboard/purism/librem_bdl/Makefile.inc (renamed from src/mainboard/purism/librem13v1/Makefile.inc)4
-rw-r--r--src/mainboard/purism/librem_bdl/acpi/ec.asl (renamed from src/mainboard/purism/librem13v1/acpi/ec.asl)0
-rw-r--r--src/mainboard/purism/librem_bdl/acpi/mainboard.asl (renamed from src/mainboard/purism/librem13v1/acpi/mainboard.asl)0
-rw-r--r--src/mainboard/purism/librem_bdl/acpi/superio.asl (renamed from src/mainboard/purism/librem13v1/acpi/superio.asl)0
-rw-r--r--src/mainboard/purism/librem_bdl/acpi_tables.c (renamed from src/mainboard/purism/librem13v1/acpi_tables.c)0
-rw-r--r--src/mainboard/purism/librem_bdl/board_info.txt (renamed from src/mainboard/purism/librem13v1/board_info.txt)3
-rw-r--r--src/mainboard/purism/librem_bdl/dsdt.asl (renamed from src/mainboard/purism/librem13v1/dsdt.asl)0
-rw-r--r--src/mainboard/purism/librem_bdl/fadt.c (renamed from src/mainboard/purism/librem13v1/fadt.c)0
-rw-r--r--src/mainboard/purism/librem_bdl/gpio.h (renamed from src/mainboard/purism/librem13v1/gpio.h)0
-rw-r--r--src/mainboard/purism/librem_bdl/hda_verb.c (renamed from src/mainboard/purism/librem13v1/hda_verb.c)0
-rw-r--r--src/mainboard/purism/librem_bdl/mainboard.c (renamed from src/mainboard/purism/librem13v1/mainboard.c)0
-rw-r--r--src/mainboard/purism/librem_bdl/romstage.c (renamed from src/mainboard/purism/librem13v1/romstage.c)0
-rw-r--r--src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt9
-rw-r--r--src/mainboard/purism/librem_bdl/variants/librem13v1/devicetree.cb (renamed from src/mainboard/purism/librem13v1/devicetree.cb)0
-rw-r--r--src/mainboard/purism/librem_bdl/variants/librem13v1/pei_data.c (renamed from src/mainboard/purism/librem13v1/pei_data.c)0
17 files changed, 39 insertions, 10 deletions
diff --git a/src/mainboard/purism/librem13v1/Kconfig b/src/mainboard/purism/librem_bdl/Kconfig
index c4fb14bff3..63863ca41a 100644
--- a/src/mainboard/purism/librem13v1/Kconfig
+++ b/src/mainboard/purism/librem_bdl/Kconfig
@@ -1,7 +1,5 @@
-if BOARD_PURISM_LIBREM13_V1
-
-config BOARD_SPECIFIC_OPTIONS # dummy
- def_bool y
+config BOARD_PURISM_BASEBOARD_LIBREM_BDL
+ def_bool n
select SYSTEM_TYPE_LAPTOP
select BOARD_ROMSIZE_KB_8192
select EC_PURISM_LIBREM
@@ -10,6 +8,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select INTEL_INT15
select SOC_INTEL_BROADWELL
+if BOARD_PURISM_BASEBOARD_LIBREM_BDL
+
+config VARIANT_DIR
+ string
+ default "librem13v1" if BOARD_PURISM_LIBREM13_V1
+
+config DEVICETREE
+ string
+ default "variants/librem13v1/devicetree.cb" if BOARD_PURISM_LIBREM13_V1
+
config DRIVERS_PS2_KEYBOARD
def_bool y
help
@@ -37,11 +45,23 @@ config HAVE_ME_BIN
config MAINBOARD_DIR
string
- default purism/librem13v1
+ default purism/librem_bdl
+
+config MAINBOARD_VENDOR
+ string
+ default "Purism"
config MAINBOARD_PART_NUMBER
string
- default "Librem 13 v1"
+ default "Librem 13 v1" if BOARD_PURISM_LIBREM13_V1
+
+config MAINBOARD_FAMILY
+ string
+ default "Librem 13" if BOARD_PURISM_LIBREM13_V1
+
+config MAINBOARD_VERSION
+ string
+ default "1.0" if BOARD_PURISM_LIBREM13_V1
config MAX_CPUS
int
diff --git a/src/mainboard/purism/librem13v1/Kconfig.name b/src/mainboard/purism/librem_bdl/Kconfig.name
index c32690c430..498c6ef2bf 100644
--- a/src/mainboard/purism/librem13v1/Kconfig.name
+++ b/src/mainboard/purism/librem_bdl/Kconfig.name
@@ -1,2 +1,3 @@
config BOARD_PURISM_LIBREM13_V1
bool "Librem 13 v1"
+ select BOARD_PURISM_BASEBOARD_LIBREM_BDL
diff --git a/src/mainboard/purism/librem13v1/Makefile.inc b/src/mainboard/purism/librem_bdl/Makefile.inc
index 44e79c3889..293e186cec 100644
--- a/src/mainboard/purism/librem13v1/Makefile.inc
+++ b/src/mainboard/purism/librem_bdl/Makefile.inc
@@ -13,5 +13,5 @@
## GNU General Public License for more details.
##
-romstage-y += pei_data.c
-ramstage-y += pei_data.c
+romstage-y += variants/$(VARIANT_DIR)/pei_data.c
+ramstage-y += variants/$(VARIANT_DIR)/pei_data.c
diff --git a/src/mainboard/purism/librem13v1/acpi/ec.asl b/src/mainboard/purism/librem_bdl/acpi/ec.asl
index b2fa5b9924..b2fa5b9924 100644
--- a/src/mainboard/purism/librem13v1/acpi/ec.asl
+++ b/src/mainboard/purism/librem_bdl/acpi/ec.asl
diff --git a/src/mainboard/purism/librem13v1/acpi/mainboard.asl b/src/mainboard/purism/librem_bdl/acpi/mainboard.asl
index f0b2c1d046..f0b2c1d046 100644
--- a/src/mainboard/purism/librem13v1/acpi/mainboard.asl
+++ b/src/mainboard/purism/librem_bdl/acpi/mainboard.asl
diff --git a/src/mainboard/purism/librem13v1/acpi/superio.asl b/src/mainboard/purism/librem_bdl/acpi/superio.asl
index 92c272e4b6..92c272e4b6 100644
--- a/src/mainboard/purism/librem13v1/acpi/superio.asl
+++ b/src/mainboard/purism/librem_bdl/acpi/superio.asl
diff --git a/src/mainboard/purism/librem13v1/acpi_tables.c b/src/mainboard/purism/librem_bdl/acpi_tables.c
index b51be025c9..b51be025c9 100644
--- a/src/mainboard/purism/librem13v1/acpi_tables.c
+++ b/src/mainboard/purism/librem_bdl/acpi_tables.c
diff --git a/src/mainboard/purism/librem13v1/board_info.txt b/src/mainboard/purism/librem_bdl/board_info.txt
index caaa9d924f..99b05e7fd7 100644
--- a/src/mainboard/purism/librem13v1/board_info.txt
+++ b/src/mainboard/purism/librem_bdl/board_info.txt
@@ -1,7 +1,6 @@
Category: laptop
Vendor name: Purism
-Board name: Librem 13 v1
-Board URL: https://puri.sm/librem-13/
+Board name: Librem Broadwell baseboard
ROM package: SOIC8
ROM protocol: SPI
ROM socketed: n
diff --git a/src/mainboard/purism/librem13v1/dsdt.asl b/src/mainboard/purism/librem_bdl/dsdt.asl
index 955857aaa4..955857aaa4 100644
--- a/src/mainboard/purism/librem13v1/dsdt.asl
+++ b/src/mainboard/purism/librem_bdl/dsdt.asl
diff --git a/src/mainboard/purism/librem13v1/fadt.c b/src/mainboard/purism/librem_bdl/fadt.c
index 9cbcd3f4f0..9cbcd3f4f0 100644
--- a/src/mainboard/purism/librem13v1/fadt.c
+++ b/src/mainboard/purism/librem_bdl/fadt.c
diff --git a/src/mainboard/purism/librem13v1/gpio.h b/src/mainboard/purism/librem_bdl/gpio.h
index 98b09bc45a..98b09bc45a 100644
--- a/src/mainboard/purism/librem13v1/gpio.h
+++ b/src/mainboard/purism/librem_bdl/gpio.h
diff --git a/src/mainboard/purism/librem13v1/hda_verb.c b/src/mainboard/purism/librem_bdl/hda_verb.c
index 958a9391af..958a9391af 100644
--- a/src/mainboard/purism/librem13v1/hda_verb.c
+++ b/src/mainboard/purism/librem_bdl/hda_verb.c
diff --git a/src/mainboard/purism/librem13v1/mainboard.c b/src/mainboard/purism/librem_bdl/mainboard.c
index 2ca559ab22..2ca559ab22 100644
--- a/src/mainboard/purism/librem13v1/mainboard.c
+++ b/src/mainboard/purism/librem_bdl/mainboard.c
diff --git a/src/mainboard/purism/librem13v1/romstage.c b/src/mainboard/purism/librem_bdl/romstage.c
index 2e0ae85b95..2e0ae85b95 100644
--- a/src/mainboard/purism/librem13v1/romstage.c
+++ b/src/mainboard/purism/librem_bdl/romstage.c
diff --git a/src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt b/src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt
new file mode 100644
index 0000000000..2e4dfd9ee1
--- /dev/null
+++ b/src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt
@@ -0,0 +1,9 @@
+Category: laptop
+Vendor name: Purism
+Board name: Librem 13 v1
+Board URL: https://web.archive.org/web/20161018125457/https://puri.sm/librem-13
+ROM package: SOIC8
+ROM protocol: SPI
+ROM socketed: n
+Flashrom support: y
+Release year: 2015
diff --git a/src/mainboard/purism/librem13v1/devicetree.cb b/src/mainboard/purism/librem_bdl/variants/librem13v1/devicetree.cb
index e713cd2f56..e713cd2f56 100644
--- a/src/mainboard/purism/librem13v1/devicetree.cb
+++ b/src/mainboard/purism/librem_bdl/variants/librem13v1/devicetree.cb
diff --git a/src/mainboard/purism/librem13v1/pei_data.c b/src/mainboard/purism/librem_bdl/variants/librem13v1/pei_data.c
index e6b857d141..e6b857d141 100644
--- a/src/mainboard/purism/librem13v1/pei_data.c
+++ b/src/mainboard/purism/librem_bdl/variants/librem13v1/pei_data.c