summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@puri.sm>2020-10-29 20:37:56 -0500
committerAngel Pons <th3fanbus@gmail.com>2020-11-03 19:03:54 +0000
commitbf355e7159b3c812f748e366fdffdf0eade77e9d (patch)
treefd4ea219bfc4808fe6baa1574a9cd23c9f23b436 /src
parent54e0fd21b1f916a3f152114027db1029a921fc55 (diff)
downloadcoreboot-bf355e7159b3c812f748e366fdffdf0eade77e9d.tar.xz
mb/purism/librem_cnl: Adjust in preparation for new variants
- Move the SoC select to board config (vs baseboard config) - Qualify the VGA PCI ID and CBFS size values based on board selection - Move devicetree to variant dir and add Kconfig entry - Use a separate board_info.txt for the baseboard and each variant Change-Id: I4764f2c1243ea49bd08e0735865cc3cb7a66441f Signed-off-by: Matt DeVillier <matt.devillier@puri.sm> Reviewed-on: https://review.coreboot.org/c/coreboot/+/47051 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/purism/librem_cnl/Kconfig9
-rw-r--r--src/mainboard/purism/librem_cnl/Kconfig.name1
-rw-r--r--src/mainboard/purism/librem_cnl/board_info.txt4
-rw-r--r--src/mainboard/purism/librem_cnl/variants/librem_mini/board_info.txt8
-rw-r--r--src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb (renamed from src/mainboard/purism/librem_cnl/devicetree.cb)0
5 files changed, 17 insertions, 5 deletions
diff --git a/src/mainboard/purism/librem_cnl/Kconfig b/src/mainboard/purism/librem_cnl/Kconfig
index 38be3806d5..464350ce8c 100644
--- a/src/mainboard/purism/librem_cnl/Kconfig
+++ b/src/mainboard/purism/librem_cnl/Kconfig
@@ -9,7 +9,6 @@ config BOARD_PURISM_BASEBOARD_LIBREM_CNL
select NO_UART_ON_SUPERIO
select SOC_INTEL_COMMON_BLOCK_HDA
select SOC_INTEL_COMMON_BLOCK_HDA_VERB
- select SOC_INTEL_WHISKEYLAKE
select SPD_READ_BY_WORD
select USE_LEGACY_8254_TIMER
@@ -31,9 +30,13 @@ config VARIANT_DIR
string
default "librem_mini" if BOARD_PURISM_LIBREM_MINI
+config DEVICETREE
+ string
+ default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
+
config CBFS_SIZE
hex
- default 0x800000
+ default 0x800000 if BOARD_PURISM_LIBREM_MINI
config MAX_CPUS
int
@@ -49,7 +52,7 @@ config DIMM_SPD_SIZE
config VGA_BIOS_ID
string
- default "8086,3ea0"
+ default "8086,3ea0" if BOARD_PURISM_LIBREM_MINI
config PXE_ROM_ID
string
diff --git a/src/mainboard/purism/librem_cnl/Kconfig.name b/src/mainboard/purism/librem_cnl/Kconfig.name
index 326165ba07..83f1495ab1 100644
--- a/src/mainboard/purism/librem_cnl/Kconfig.name
+++ b/src/mainboard/purism/librem_cnl/Kconfig.name
@@ -1,3 +1,4 @@
config BOARD_PURISM_LIBREM_MINI
bool "Librem Mini"
select BOARD_PURISM_BASEBOARD_LIBREM_CNL
+ select SOC_INTEL_WHISKEYLAKE
diff --git a/src/mainboard/purism/librem_cnl/board_info.txt b/src/mainboard/purism/librem_cnl/board_info.txt
index ca61edd88d..6c7620ce1e 100644
--- a/src/mainboard/purism/librem_cnl/board_info.txt
+++ b/src/mainboard/purism/librem_cnl/board_info.txt
@@ -1,6 +1,6 @@
Vendor name: Purism
-Board name: librem_cnl
-Category: desktop
+Board name: Librem Cannonlake baseboard
+Category: misc
Release year: 2020
ROM package: SOIC-8
ROM protocol: SPI
diff --git a/src/mainboard/purism/librem_cnl/variants/librem_mini/board_info.txt b/src/mainboard/purism/librem_cnl/variants/librem_mini/board_info.txt
new file mode 100644
index 0000000000..843ff9ff7c
--- /dev/null
+++ b/src/mainboard/purism/librem_cnl/variants/librem_mini/board_info.txt
@@ -0,0 +1,8 @@
+Vendor name: Purism
+Board name: Librem Mini
+Category: desktop
+Release year: 2020
+ROM package: SOIC-8
+ROM protocol: SPI
+ROM socketed: n
+Flashrom support: y
diff --git a/src/mainboard/purism/librem_cnl/devicetree.cb b/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb
index 205033230b..205033230b 100644
--- a/src/mainboard/purism/librem_cnl/devicetree.cb
+++ b/src/mainboard/purism/librem_cnl/variants/librem_mini/devicetree.cb