Commit 6385bb11 authored by Matt DeVillier's avatar Matt DeVillier

Merge branch 'librem_4.8' into 'master'

Add 13v4/15v4 support, update to 4.8.1-Purism-4

See merge request !1
parents 30300027 ade55f0f
......@@ -24,7 +24,10 @@ config ME_CLEANER_ARGS
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
config MAINBOARD_VENDOR
string
......@@ -33,17 +36,26 @@ 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
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
......@@ -51,8 +63,7 @@ config MAINBOARD_DIR
config DEVICETREE
string
default "variants/librem13v2/devicetree.cb" if BOARD_PURISM_LIBREM13_V2
default "variants/librem15v3/devicetree.cb" if BOARD_PURISM_LIBREM15_V3
default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
config MAX_CPUS
int
......@@ -66,7 +77,11 @@ config NO_POST
config VGA_BIOS_ID
string
default "8086,1916"
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
config DIMM_MAX
int
......@@ -86,6 +101,6 @@ config CPU_MICROCODE_CBFS_LOC
config CBFS_SIZE
hex
default 0x5c0000
default 0xe00000
endif
......@@ -2,6 +2,18 @@ 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
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment