Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31010
Change subject: mb/purism/librem_skl: add 13v3 variant ......................................................................
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 matt.devillier@puri.sm --- M src/mainboard/purism/librem_skl/Kconfig M src/mainboard/purism/librem_skl/Kconfig.name 2 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/31010/1
diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig index bf62bff..b3413b7 100644 --- a/src/mainboard/purism/librem_skl/Kconfig +++ b/src/mainboard/purism/librem_skl/Kconfig @@ -22,6 +22,7 @@ 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_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_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_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 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 6a66e45..5b82de7 100644 --- a/src/mainboard/purism/librem_skl/Kconfig.name +++ b/src/mainboard/purism/librem_skl/Kconfig.name @@ -2,6 +2,10 @@ 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
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31010 )
Change subject: mb/purism/librem_skl: add 13v3 variant ......................................................................
Patch Set 1: Code-Review+2
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31010 )
Change subject: mb/purism/librem_skl: add 13v3 variant ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/31010/1/src/mainboard/purism/librem_skl/Kcon... File src/mainboard/purism/librem_skl/Kconfig:
https://review.coreboot.org/#/c/31010/1/src/mainboard/purism/librem_skl/Kcon... PS1, Line 24: 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 : : config MAINBOARD_VENDOR : string : default "Purism" : : 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 : : 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 : : 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 wouldn't it be better to use '||' per 'default' entries.
Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31010 )
Change subject: mb/purism/librem_skl: add 13v3 variant ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/31010/1/src/mainboard/purism/librem_skl/Kcon... File src/mainboard/purism/librem_skl/Kconfig:
https://review.coreboot.org/#/c/31010/1/src/mainboard/purism/librem_skl/Kcon... PS1, Line 24: 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 : : config MAINBOARD_VENDOR : string : default "Purism" : : 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 : : 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 : : 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
wouldn't it be better to use '||' per 'default' entries.
had that originally, but with 3 BOARD_ entries for some lines, makes them excessively long and difficult to read, so used the same format for all entries
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31010 )
Change subject: mb/purism/librem_skl: add 13v3 variant ......................................................................
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 matt.devillier@puri.sm Reviewed-on: https://review.coreboot.org/c/31010 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/purism/librem_skl/Kconfig M src/mainboard/purism/librem_skl/Kconfig.name 2 files changed, 9 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig index bf62bff..b3413b7 100644 --- a/src/mainboard/purism/librem_skl/Kconfig +++ b/src/mainboard/purism/librem_skl/Kconfig @@ -22,6 +22,7 @@ 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_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_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_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 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 6a66e45..5b82de7 100644 --- a/src/mainboard/purism/librem_skl/Kconfig.name +++ b/src/mainboard/purism/librem_skl/Kconfig.name @@ -2,6 +2,10 @@ 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
-
Angel Pons (Code Review) -
Arthur Heymans (Code Review)
-
Matt DeVillier (Code Review)
-
Patrick Georgi (Code Review)