[coreboot-gerrit] Change in coreboot[master]: purism/librem_bdl: Convert to variant setup
Youness Alaoui (Code Review)
gerrit at coreboot.org
Wed May 9 03:05:20 CEST 2018
Youness Alaoui has uploaded this change for review. ( https://review.coreboot.org/26183
Change subject: purism/librem_bdl: Convert to variant setup
......................................................................
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 at puri.sm>
---
D src/mainboard/purism/librem13v1/Kconfig.name
R src/mainboard/purism/librem_bdl/Kconfig
A src/mainboard/purism/librem_bdl/Kconfig.name
R src/mainboard/purism/librem_bdl/Makefile.inc
R src/mainboard/purism/librem_bdl/acpi/ec.asl
R src/mainboard/purism/librem_bdl/acpi/mainboard.asl
R src/mainboard/purism/librem_bdl/acpi/superio.asl
R src/mainboard/purism/librem_bdl/acpi_tables.c
R src/mainboard/purism/librem_bdl/board_info.txt
R src/mainboard/purism/librem_bdl/dsdt.asl
R src/mainboard/purism/librem_bdl/fadt.c
R src/mainboard/purism/librem_bdl/gpio.h
R src/mainboard/purism/librem_bdl/hda_verb.c
R src/mainboard/purism/librem_bdl/mainboard.c
R src/mainboard/purism/librem_bdl/romstage.c
C src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt
R src/mainboard/purism/librem_bdl/variants/librem13v1/devicetree.cb
R src/mainboard/purism/librem_bdl/variants/librem13v1/pei_data.c
18 files changed, 33 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/26183/1
diff --git a/src/mainboard/purism/librem13v1/Kconfig.name b/src/mainboard/purism/librem13v1/Kconfig.name
deleted file mode 100644
index c32690c..0000000
--- a/src/mainboard/purism/librem13v1/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_PURISM_LIBREM13_V1
- bool "Librem 13 v1"
diff --git a/src/mainboard/purism/librem13v1/Kconfig b/src/mainboard/purism/librem_bdl/Kconfig
similarity index 61%
rename from src/mainboard/purism/librem13v1/Kconfig
rename to src/mainboard/purism/librem_bdl/Kconfig
index c4fb14b..63863ca 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 @@
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 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/librem_bdl/Kconfig.name b/src/mainboard/purism/librem_bdl/Kconfig.name
new file mode 100644
index 0000000..498c6ef
--- /dev/null
+++ b/src/mainboard/purism/librem_bdl/Kconfig.name
@@ -0,0 +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
similarity index 84%
rename from src/mainboard/purism/librem13v1/Makefile.inc
rename to src/mainboard/purism/librem_bdl/Makefile.inc
index 44e79c3..293e186 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
similarity index 100%
rename from src/mainboard/purism/librem13v1/acpi/ec.asl
rename to 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
similarity index 100%
rename from src/mainboard/purism/librem13v1/acpi/mainboard.asl
rename to 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
similarity index 100%
rename from src/mainboard/purism/librem13v1/acpi/superio.asl
rename to 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
similarity index 100%
rename from src/mainboard/purism/librem13v1/acpi_tables.c
rename to 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
similarity index 67%
rename from src/mainboard/purism/librem13v1/board_info.txt
rename to src/mainboard/purism/librem_bdl/board_info.txt
index caaa9d9..99b05e7 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
similarity index 100%
rename from src/mainboard/purism/librem13v1/dsdt.asl
rename to src/mainboard/purism/librem_bdl/dsdt.asl
diff --git a/src/mainboard/purism/librem13v1/fadt.c b/src/mainboard/purism/librem_bdl/fadt.c
similarity index 100%
rename from src/mainboard/purism/librem13v1/fadt.c
rename to src/mainboard/purism/librem_bdl/fadt.c
diff --git a/src/mainboard/purism/librem13v1/gpio.h b/src/mainboard/purism/librem_bdl/gpio.h
similarity index 100%
rename from src/mainboard/purism/librem13v1/gpio.h
rename to 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
similarity index 100%
rename from src/mainboard/purism/librem13v1/hda_verb.c
rename to 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
similarity index 100%
rename from src/mainboard/purism/librem13v1/mainboard.c
rename to src/mainboard/purism/librem_bdl/mainboard.c
diff --git a/src/mainboard/purism/librem13v1/romstage.c b/src/mainboard/purism/librem_bdl/romstage.c
similarity index 100%
rename from src/mainboard/purism/librem13v1/romstage.c
rename to src/mainboard/purism/librem_bdl/romstage.c
diff --git a/src/mainboard/purism/librem13v1/board_info.txt b/src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt
similarity index 65%
copy from src/mainboard/purism/librem13v1/board_info.txt
copy to src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt
index caaa9d9..2e4dfd9 100644
--- a/src/mainboard/purism/librem13v1/board_info.txt
+++ b/src/mainboard/purism/librem_bdl/variants/librem13v1/board_info.txt
@@ -1,7 +1,7 @@
Category: laptop
Vendor name: Purism
Board name: Librem 13 v1
-Board URL: https://puri.sm/librem-13/
+Board URL: https://web.archive.org/web/20161018125457/https://puri.sm/librem-13
ROM package: SOIC8
ROM protocol: SPI
ROM socketed: n
diff --git a/src/mainboard/purism/librem13v1/devicetree.cb b/src/mainboard/purism/librem_bdl/variants/librem13v1/devicetree.cb
similarity index 100%
rename from src/mainboard/purism/librem13v1/devicetree.cb
rename to 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
similarity index 100%
rename from src/mainboard/purism/librem13v1/pei_data.c
rename to src/mainboard/purism/librem_bdl/variants/librem13v1/pei_data.c
--
To view, visit https://review.coreboot.org/26183
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00bb82b9e895e2464ddaa92915c01ce0e35933a2
Gerrit-Change-Number: 26183
Gerrit-PatchSet: 1
Gerrit-Owner: Youness Alaoui <snifikino at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180509/ef5a5065/attachment.html>
More information about the coreboot-gerrit
mailing list