summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@puri.sm>2019-04-29 16:03:12 -0500
committerPatrick Georgi <pgeorgi@google.com>2019-05-06 10:30:27 +0000
commit6a4a026e13ae7fa981243498df9db41a53a54096 (patch)
tree1bdd90af551b7bd2d0a9f3e46f160eb66f660019 /src/mainboard
parent32f48a2d56af951186538b6f6bcb136736f11254 (diff)
downloadcoreboot-6a4a026e13ae7fa981243498df9db41a53a54096.tar.xz
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 redundant MAINBOARD_VERSION option (will default to 1.0) - remove unused microcode length/location (only needed for FSP CAR) Test: build/boot Librem 13 v2/v3 boards with same image Change-Id: Ic09b8ec5c576f4c4c48ef30ee3f60a4c2c286cd3 Signed-off-by: Matt DeVillier <matt.devillier@puri.sm> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32515 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/purism/librem_skl/Kconfig38
-rw-r--r--src/mainboard/purism/librem_skl/Kconfig.name6
2 files changed, 7 insertions, 37 deletions
diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig
index 965318f565..2372b9d280 100644
--- a/src/mainboard/purism/librem_skl/Kconfig
+++ b/src/mainboard/purism/librem_skl/Kconfig
@@ -19,11 +19,8 @@ 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
+ 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_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
+ 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 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 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
+ 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
@@ -81,14 +63,6 @@ config DIMM_SPD_SIZE
int
default 512
-config CPU_MICROCODE_CBFS_LEN
- hex
- default 0x18000
-
-config CPU_MICROCODE_CBFS_LOC
- hex
- default 0xFFE115A0
-
config CBFS_SIZE
hex
default 0xe00000
diff --git a/src/mainboard/purism/librem_skl/Kconfig.name b/src/mainboard/purism/librem_skl/Kconfig.name
index 5b82de7435..b0dac3e338 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