summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2023-05-08 19:09:11 +0200
committerFelix Singer <service+coreboot-gerrit@felixsinger.de>2023-05-09 17:16:51 +0000
commit0be8ac547c9daa7f9296f3cbfb1599f800d0ee91 (patch)
tree9eb82ca11115efbe51ed50e3f4303e942999f884 /src/mainboard
parente599d436338fe6f7af6e0c06428fc13ce4e7778c (diff)
mb/purism: Move selects from Kconfig.name to Kconfig
Selects should be done in the Kconfig file instead of Kconfig.name. Change-Id: I2ae03a3ac548674b8c5e7dfaff47d6c536b452f1 Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/75013 Reviewed-by: Jonathon Hall <jonathon.hall@puri.sm> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/purism/librem_bdw/Kconfig6
-rw-r--r--src/mainboard/purism/librem_bdw/Kconfig.name2
-rw-r--r--src/mainboard/purism/librem_cnl/Kconfig19
-rw-r--r--src/mainboard/purism/librem_cnl/Kconfig.name13
-rw-r--r--src/mainboard/purism/librem_skl/Kconfig12
-rw-r--r--src/mainboard/purism/librem_skl/Kconfig.name4
6 files changed, 37 insertions, 19 deletions
diff --git a/src/mainboard/purism/librem_bdw/Kconfig b/src/mainboard/purism/librem_bdw/Kconfig
index dfd1fe1b33..48ca9c3cd4 100644
--- a/src/mainboard/purism/librem_bdw/Kconfig
+++ b/src/mainboard/purism/librem_bdw/Kconfig
@@ -10,6 +10,12 @@ config BOARD_PURISM_BASEBOARD_LIBREM_BDW
select MAINBOARD_HAS_TPM1
select SOC_INTEL_BROADWELL
+config BOARD_PURISM_LIBREM13_V1
+ select BOARD_PURISM_BASEBOARD_LIBREM_BDW
+
+config BOARD_PURISM_LIBREM15_V2
+ select BOARD_PURISM_BASEBOARD_LIBREM_BDW
+
if BOARD_PURISM_BASEBOARD_LIBREM_BDW
config VARIANT_DIR
diff --git a/src/mainboard/purism/librem_bdw/Kconfig.name b/src/mainboard/purism/librem_bdw/Kconfig.name
index b00eeffc30..b2dabe5be0 100644
--- a/src/mainboard/purism/librem_bdw/Kconfig.name
+++ b/src/mainboard/purism/librem_bdw/Kconfig.name
@@ -1,7 +1,5 @@
config BOARD_PURISM_LIBREM13_V1
bool "Librem 13 v1"
- select BOARD_PURISM_BASEBOARD_LIBREM_BDW
config BOARD_PURISM_LIBREM15_V2
bool "Librem 15 v2"
- select BOARD_PURISM_BASEBOARD_LIBREM_BDW
diff --git a/src/mainboard/purism/librem_cnl/Kconfig b/src/mainboard/purism/librem_cnl/Kconfig
index 45bbdc2a28..0c17ec967c 100644
--- a/src/mainboard/purism/librem_cnl/Kconfig
+++ b/src/mainboard/purism/librem_cnl/Kconfig
@@ -13,6 +13,25 @@ config BOARD_PURISM_BASEBOARD_LIBREM_CNL
select SPD_READ_BY_WORD
select USE_LEGACY_8254_TIMER
+config BOARD_PURISM_LIBREM_MINI
+ select BOARD_PURISM_BASEBOARD_LIBREM_CNL
+ select SOC_INTEL_WHISKEYLAKE
+ select SUPERIO_ITE_IT8528E
+
+config BOARD_PURISM_LIBREM_MINI_V2
+ select BOARD_PURISM_BASEBOARD_LIBREM_CNL
+ select SOC_INTEL_COMETLAKE_1
+ select SUPERIO_ITE_IT8528E
+
+config BOARD_PURISM_LIBREM_14
+ select BOARD_PURISM_BASEBOARD_LIBREM_CNL
+ select DRIVERS_I2C_HID
+ select EC_LIBREM_EC
+ select MEMORY_MAPPED_TPM
+ select MAINBOARD_HAS_TPM1
+ select SOC_INTEL_COMETLAKE_1
+ select SYSTEM_TYPE_LAPTOP
+
if BOARD_PURISM_BASEBOARD_LIBREM_CNL
config MAINBOARD_DIR
diff --git a/src/mainboard/purism/librem_cnl/Kconfig.name b/src/mainboard/purism/librem_cnl/Kconfig.name
index a575e44e04..1a649a2bcd 100644
--- a/src/mainboard/purism/librem_cnl/Kconfig.name
+++ b/src/mainboard/purism/librem_cnl/Kconfig.name
@@ -1,21 +1,8 @@
config BOARD_PURISM_LIBREM_MINI
bool "Librem Mini"
- select BOARD_PURISM_BASEBOARD_LIBREM_CNL
- select SOC_INTEL_WHISKEYLAKE
- select SUPERIO_ITE_IT8528E
config BOARD_PURISM_LIBREM_MINI_V2
bool "Librem Mini v2"
- select BOARD_PURISM_BASEBOARD_LIBREM_CNL
- select SOC_INTEL_COMETLAKE_1
- select SUPERIO_ITE_IT8528E
config BOARD_PURISM_LIBREM_14
bool "Librem 14"
- select BOARD_PURISM_BASEBOARD_LIBREM_CNL
- select DRIVERS_I2C_HID
- select EC_LIBREM_EC
- select MEMORY_MAPPED_TPM
- select MAINBOARD_HAS_TPM1
- select SOC_INTEL_COMETLAKE_1
- select SYSTEM_TYPE_LAPTOP
diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig
index e094259a31..f36952acc6 100644
--- a/src/mainboard/purism/librem_skl/Kconfig
+++ b/src/mainboard/purism/librem_skl/Kconfig
@@ -16,6 +16,18 @@ config BOARD_PURISM_BASEBOARD_LIBREM_SKL
select SPD_READ_BY_WORD
select SYSTEM_TYPE_LAPTOP
+config BOARD_PURISM_LIBREM13_V2
+ select BOARD_PURISM_BASEBOARD_LIBREM_SKL
+
+config BOARD_PURISM_LIBREM15_V3
+ select BOARD_PURISM_BASEBOARD_LIBREM_SKL
+
+config BOARD_PURISM_LIBREM13_V4
+ select BOARD_PURISM_BASEBOARD_LIBREM_SKL
+
+config BOARD_PURISM_LIBREM15_V4
+ select BOARD_PURISM_BASEBOARD_LIBREM_SKL
+
if BOARD_PURISM_BASEBOARD_LIBREM_SKL
config DISABLE_HECI1_AT_PRE_BOOT
diff --git a/src/mainboard/purism/librem_skl/Kconfig.name b/src/mainboard/purism/librem_skl/Kconfig.name
index b0dac3e338..d57ebc742d 100644
--- a/src/mainboard/purism/librem_skl/Kconfig.name
+++ b/src/mainboard/purism/librem_skl/Kconfig.name
@@ -1,15 +1,11 @@
config BOARD_PURISM_LIBREM13_V2
bool "Librem 13 v2/v3"
- select BOARD_PURISM_BASEBOARD_LIBREM_SKL
config BOARD_PURISM_LIBREM15_V3
bool "Librem 15 v3"
- select BOARD_PURISM_BASEBOARD_LIBREM_SKL
config BOARD_PURISM_LIBREM13_V4
bool "Librem 13 v4"
- select BOARD_PURISM_BASEBOARD_LIBREM_SKL
config BOARD_PURISM_LIBREM15_V4
bool "Librem 15 v4"
- select BOARD_PURISM_BASEBOARD_LIBREM_SKL