Matt DeVillier has uploaded this change for review.

View Change

purism/librem_skl: remove 13v3 target, clean up KConfig

Remove the Librem 13v3 as a separate board; instead build a
single firmware image for the 13 v2/v3 boards.

Clean up Kconfig options:
- remove entries for 13v3 board
- fold entries into a single line where possible
- remove reduntant MAINBOARD_VERSION option
- specify microcode length separately for SKL and KBL devices

Change-Id: Ic09b8ec5c576f4c4c48ef30ee3f60a4c2c286cd3
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, 10 insertions(+), 31 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/32515/1

diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig
index 965318f..7edb1b3 100644
--- a/src/mainboard/purism/librem_skl/Kconfig
+++ b/src/mainboard/purism/librem_skl/Kconfig
@@ -19,11 +19,8 @@
 
 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
+	default "librem13v2" if BOARD_PURISM_LIBREM13_V2 || BOARD_PURISM_LIBREM13_V4
+	default "librem15v3" if BOARD_PURISM_LIBREM15_V3 || BOARD_PURISM_LIBREM15_V4
 
 config MAINBOARD_VENDOR
 	string
@@ -31,28 +28,16 @@
 
 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
+	default "Librem 13" if BOARD_PURISM_LIBREM13_V2 || BOARD_PURISM_LIBREM13_V4
+	default "Librem 15" if BOARD_PURISM_LIBREM15_V3 || 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 13 v2/v3" if BOARD_PURISM_LIBREM13_V2
 	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
-
 config MAINBOARD_DIR
 	string
 	default "purism/librem_skl"
@@ -67,11 +52,8 @@
 
 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
+	default "8086,1916" if BOARD_PURISM_LIBREM13_V2 || BOARD_PURISM_LIBREM15_V3
+	default "8086,5916" if BOARD_PURISM_LIBREM13_V4 || BOARD_PURISM_LIBREM15_V4
 
 config DIMM_MAX
 	int
@@ -83,7 +65,8 @@
 
 config CPU_MICROCODE_CBFS_LEN
 	hex
-	default 0x18000
+	default 0x18800 if BOARD_PURISM_LIBREM13_V2 || BOARD_PURISM_LIBREM15_V3
+	default 0x18400 if BOARD_PURISM_LIBREM13_V4 || BOARD_PURISM_LIBREM15_V4
 
 config CPU_MICROCODE_CBFS_LOC
 	hex
diff --git a/src/mainboard/purism/librem_skl/Kconfig.name b/src/mainboard/purism/librem_skl/Kconfig.name
index 5b82de7..b0dac3e 100644
--- a/src/mainboard/purism/librem_skl/Kconfig.name
+++ b/src/mainboard/purism/librem_skl/Kconfig.name
@@ -1,9 +1,5 @@
 config BOARD_PURISM_LIBREM13_V2
-	bool "Librem 13 v2"
-	select BOARD_PURISM_BASEBOARD_LIBREM_SKL
-
-config BOARD_PURISM_LIBREM13_V3
-	bool "Librem 13 v3"
+	bool "Librem 13 v2/v3"
 	select BOARD_PURISM_BASEBOARD_LIBREM_SKL
 
 config BOARD_PURISM_LIBREM15_V3

To view, visit change 32515. To unsubscribe, or for help writing mail filters, visit settings.