From b28d8b68bad4d8777b7e4131b127cd55bfb4357e Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 18 Jan 2019 23:00:20 -0600 Subject: mb/purism/librem_skl: add 13v3 variant The 13v3 is just a 13v2 with TPM added, so duplicate 13v2 config and change strings where needed. Leave MAINBOARD_PART_NUMBER unchanged since boards were initially shipped with 13v2 firmware, and changing it now would cause flashrom to throw a board mismatch error. Change-Id: I1a5e4c84cc9444bb9731b6dcc4de2ce7427dbbb1 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/31010 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/mainboard/purism/librem_skl/Kconfig | 5 +++++ src/mainboard/purism/librem_skl/Kconfig.name | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'src/mainboard/purism') diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig index bf62bff21c..b3413b73d5 100644 --- a/src/mainboard/purism/librem_skl/Kconfig +++ b/src/mainboard/purism/librem_skl/Kconfig @@ -22,6 +22,7 @@ config IRQ_SLOT_COUNT config VARIANT_DIR string default "librem13v2" if BOARD_PURISM_LIBREM13_V2 + default "librem13v2" if BOARD_PURISM_LIBREM13_V3 default "librem15v3" if BOARD_PURISM_LIBREM15_V3 default "librem13v2" if BOARD_PURISM_LIBREM13_V4 default "librem15v3" if BOARD_PURISM_LIBREM15_V4 @@ -33,6 +34,7 @@ config MAINBOARD_VENDOR config MAINBOARD_FAMILY string default "Librem 13" if BOARD_PURISM_LIBREM13_V2 + default "Librem 13" if BOARD_PURISM_LIBREM13_V3 default "Librem 15" if BOARD_PURISM_LIBREM15_V3 default "Librem 13" if BOARD_PURISM_LIBREM13_V4 default "Librem 15" if BOARD_PURISM_LIBREM15_V4 @@ -40,6 +42,7 @@ config MAINBOARD_FAMILY config MAINBOARD_PART_NUMBER string default "Librem 13 v2" if BOARD_PURISM_LIBREM13_V2 + default "Librem 13 v2" if BOARD_PURISM_LIBREM13_V3 default "Librem 15 v3" if BOARD_PURISM_LIBREM15_V3 default "Librem 13 v4" if BOARD_PURISM_LIBREM13_V4 default "Librem 15 v4" if BOARD_PURISM_LIBREM15_V4 @@ -47,6 +50,7 @@ config MAINBOARD_PART_NUMBER config MAINBOARD_VERSION string default "2.0" if BOARD_PURISM_LIBREM13_V2 + default "3.0" if BOARD_PURISM_LIBREM13_V3 default "3.0" if BOARD_PURISM_LIBREM15_V3 default "4.0" if BOARD_PURISM_LIBREM13_V4 default "4.0" if BOARD_PURISM_LIBREM15_V4 @@ -66,6 +70,7 @@ config MAX_CPUS config VGA_BIOS_ID string default "8086,1916" if BOARD_PURISM_LIBREM13_V2 + default "8086,1916" if BOARD_PURISM_LIBREM13_V3 default "8086,1916" if BOARD_PURISM_LIBREM15_V3 default "8086,5916" if BOARD_PURISM_LIBREM13_V4 default "8086,5916" if BOARD_PURISM_LIBREM15_V4 diff --git a/src/mainboard/purism/librem_skl/Kconfig.name b/src/mainboard/purism/librem_skl/Kconfig.name index 6a66e45950..5b82de7435 100644 --- a/src/mainboard/purism/librem_skl/Kconfig.name +++ b/src/mainboard/purism/librem_skl/Kconfig.name @@ -2,6 +2,10 @@ config BOARD_PURISM_LIBREM13_V2 bool "Librem 13 v2" select BOARD_PURISM_BASEBOARD_LIBREM_SKL +config BOARD_PURISM_LIBREM13_V3 + bool "Librem 13 v3" + select BOARD_PURISM_BASEBOARD_LIBREM_SKL + config BOARD_PURISM_LIBREM15_V3 bool "Librem 15 v3" select BOARD_PURISM_BASEBOARD_LIBREM_SKL -- cgit v1.2.3