From 2b2f67fb7e3e6e7dd6360540c16a2cf8e52b7175 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Thu, 30 Apr 2020 14:47:26 -0500 Subject: mb/purism/librem_skl: rename variant directories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the same variant dirs are used by multiple versions of the same board, drop the v2/v3 labels. Signed-off-by: Matt DeVillier Change-Id: Id913e31ab52043e49769be9d3ebf6e71ecb0c856 Reviewed-on: https://review.coreboot.org/c/coreboot/+/40912 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- src/mainboard/purism/librem_skl/Kconfig | 4 ++-- .../librem_skl/variants/librem13/board_info.txt | 9 ++++++++ .../librem_skl/variants/librem13/overridetree.cb | 17 ++++++++++++++ .../librem_skl/variants/librem13v2/board_info.txt | 9 -------- .../librem_skl/variants/librem13v2/overridetree.cb | 17 -------------- .../librem_skl/variants/librem15/board_info.txt | 9 ++++++++ .../librem_skl/variants/librem15/overridetree.cb | 27 ++++++++++++++++++++++ .../librem_skl/variants/librem15v3/board_info.txt | 9 -------- .../librem_skl/variants/librem15v3/overridetree.cb | 27 ---------------------- 9 files changed, 64 insertions(+), 64 deletions(-) create mode 100644 src/mainboard/purism/librem_skl/variants/librem13/board_info.txt create mode 100644 src/mainboard/purism/librem_skl/variants/librem13/overridetree.cb delete mode 100644 src/mainboard/purism/librem_skl/variants/librem13v2/board_info.txt delete mode 100644 src/mainboard/purism/librem_skl/variants/librem13v2/overridetree.cb create mode 100644 src/mainboard/purism/librem_skl/variants/librem15/board_info.txt create mode 100644 src/mainboard/purism/librem_skl/variants/librem15/overridetree.cb delete mode 100644 src/mainboard/purism/librem_skl/variants/librem15v3/board_info.txt delete mode 100644 src/mainboard/purism/librem_skl/variants/librem15v3/overridetree.cb diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig index be4c391e60..08fa4c7d43 100644 --- a/src/mainboard/purism/librem_skl/Kconfig +++ b/src/mainboard/purism/librem_skl/Kconfig @@ -20,8 +20,8 @@ config IRQ_SLOT_COUNT config VARIANT_DIR string - default "librem13v2" if BOARD_PURISM_LIBREM13_V2 || BOARD_PURISM_LIBREM13_V4 - default "librem15v3" if BOARD_PURISM_LIBREM15_V3 || BOARD_PURISM_LIBREM15_V4 + default "librem13" if BOARD_PURISM_LIBREM13_V2 || BOARD_PURISM_LIBREM13_V4 + default "librem15" if BOARD_PURISM_LIBREM15_V3 || BOARD_PURISM_LIBREM15_V4 config MAINBOARD_FAMILY string diff --git a/src/mainboard/purism/librem_skl/variants/librem13/board_info.txt b/src/mainboard/purism/librem_skl/variants/librem13/board_info.txt new file mode 100644 index 0000000000..fb0dd0bec8 --- /dev/null +++ b/src/mainboard/purism/librem_skl/variants/librem13/board_info.txt @@ -0,0 +1,9 @@ +Vendor name: Purism +Board name: Librem 13 v2 +Board URL: https://puri.sm/librem-13/ +Category: laptop +ROM package: SOIC8 +ROM protocol: SPI +ROM socketed: n +Flashrom support: y +Release year: 2017 diff --git a/src/mainboard/purism/librem_skl/variants/librem13/overridetree.cb b/src/mainboard/purism/librem_skl/variants/librem13/overridetree.cb new file mode 100644 index 0000000000..18ce220753 --- /dev/null +++ b/src/mainboard/purism/librem_skl/variants/librem13/overridetree.cb @@ -0,0 +1,17 @@ +chip soc/intel/skylake + + register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)" # Type-C Port + register "usb2_ports[1]" = "USB2_PORT_MID(OC0)" # Type-A Port (right) + register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth + register "usb2_ports[3]" = "USB2_PORT_FLEX(OC_SKIP)" # Camera + register "usb2_ports[5]" = "USB2_PORT_FLEX(OC2)" # Type-A Port (left) + register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # SD + + # OC1 should be for Type-C but it seems to not have been wired, according to + # the available schematics, even though it is labeled as USB_OC_TYPEC. + register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-C Port + register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC0)" # Type-A Port (right) + register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-C Port + + device domain 0 on end +end diff --git a/src/mainboard/purism/librem_skl/variants/librem13v2/board_info.txt b/src/mainboard/purism/librem_skl/variants/librem13v2/board_info.txt deleted file mode 100644 index fb0dd0bec8..0000000000 --- a/src/mainboard/purism/librem_skl/variants/librem13v2/board_info.txt +++ /dev/null @@ -1,9 +0,0 @@ -Vendor name: Purism -Board name: Librem 13 v2 -Board URL: https://puri.sm/librem-13/ -Category: laptop -ROM package: SOIC8 -ROM protocol: SPI -ROM socketed: n -Flashrom support: y -Release year: 2017 diff --git a/src/mainboard/purism/librem_skl/variants/librem13v2/overridetree.cb b/src/mainboard/purism/librem_skl/variants/librem13v2/overridetree.cb deleted file mode 100644 index 18ce220753..0000000000 --- a/src/mainboard/purism/librem_skl/variants/librem13v2/overridetree.cb +++ /dev/null @@ -1,17 +0,0 @@ -chip soc/intel/skylake - - register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)" # Type-C Port - register "usb2_ports[1]" = "USB2_PORT_MID(OC0)" # Type-A Port (right) - register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth - register "usb2_ports[3]" = "USB2_PORT_FLEX(OC_SKIP)" # Camera - register "usb2_ports[5]" = "USB2_PORT_FLEX(OC2)" # Type-A Port (left) - register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # SD - - # OC1 should be for Type-C but it seems to not have been wired, according to - # the available schematics, even though it is labeled as USB_OC_TYPEC. - register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-C Port - register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC0)" # Type-A Port (right) - register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-C Port - - device domain 0 on end -end diff --git a/src/mainboard/purism/librem_skl/variants/librem15/board_info.txt b/src/mainboard/purism/librem_skl/variants/librem15/board_info.txt new file mode 100644 index 0000000000..9617bafc4b --- /dev/null +++ b/src/mainboard/purism/librem_skl/variants/librem15/board_info.txt @@ -0,0 +1,9 @@ +Vendor name: Purism +Board name: Librem 15 v3 +Board URL: https://puri.sm/librem-15/ +Category: laptop +ROM package: SOIC8 +ROM protocol: SPI +ROM socketed: n +Flashrom support: y +Release year: 2017 diff --git a/src/mainboard/purism/librem_skl/variants/librem15/overridetree.cb b/src/mainboard/purism/librem_skl/variants/librem15/overridetree.cb new file mode 100644 index 0000000000..ab46cd3cd1 --- /dev/null +++ b/src/mainboard/purism/librem_skl/variants/librem15/overridetree.cb @@ -0,0 +1,27 @@ +chip soc/intel/skylake + + # Enable CLKREQ# for RP9 + register "PcieRpClkReqSupport[8]" = "1" + # SRCCLKREQ2# for NVMe per schematic + register "PcieRpClkReqNumber[8]" = "2" + + register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)" # Type-C Port + register "usb2_ports[1]" = "USB2_PORT_MID(OC1)" # Type-A Port (right) + register "usb2_ports[2]" = "USB2_PORT_MID(OC1)" # Type-A Port (right) + register "usb2_ports[3]" = "USB2_PORT_FLEX(OC2)" # Type-A Port (left) + register "usb2_ports[4]" = "USB2_PORT_FLEX(OC2)" # Type-A Port (left) + register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth + register "usb2_ports[6]" = "USB2_PORT_FLEX(OC_SKIP)" # Camera + register "usb2_ports[7]" = "USB2_PORT_FLEX(OC_SKIP)" # SD + + # OC0 should be for Type-C but it seems to not have been wired, according to + # the available schematics, even though it is labeled as USB_OC_TYPEC. + register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-C Port + register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC1)" # Type-A Port (right) + register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC1)" # Type-A Port (right) + register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-C Port + + device domain 0 on + device pci 1c.4 on end # PCI Express Port 5 + end +end diff --git a/src/mainboard/purism/librem_skl/variants/librem15v3/board_info.txt b/src/mainboard/purism/librem_skl/variants/librem15v3/board_info.txt deleted file mode 100644 index 9617bafc4b..0000000000 --- a/src/mainboard/purism/librem_skl/variants/librem15v3/board_info.txt +++ /dev/null @@ -1,9 +0,0 @@ -Vendor name: Purism -Board name: Librem 15 v3 -Board URL: https://puri.sm/librem-15/ -Category: laptop -ROM package: SOIC8 -ROM protocol: SPI -ROM socketed: n -Flashrom support: y -Release year: 2017 diff --git a/src/mainboard/purism/librem_skl/variants/librem15v3/overridetree.cb b/src/mainboard/purism/librem_skl/variants/librem15v3/overridetree.cb deleted file mode 100644 index ab46cd3cd1..0000000000 --- a/src/mainboard/purism/librem_skl/variants/librem15v3/overridetree.cb +++ /dev/null @@ -1,27 +0,0 @@ -chip soc/intel/skylake - - # Enable CLKREQ# for RP9 - register "PcieRpClkReqSupport[8]" = "1" - # SRCCLKREQ2# for NVMe per schematic - register "PcieRpClkReqNumber[8]" = "2" - - register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)" # Type-C Port - register "usb2_ports[1]" = "USB2_PORT_MID(OC1)" # Type-A Port (right) - register "usb2_ports[2]" = "USB2_PORT_MID(OC1)" # Type-A Port (right) - register "usb2_ports[3]" = "USB2_PORT_FLEX(OC2)" # Type-A Port (left) - register "usb2_ports[4]" = "USB2_PORT_FLEX(OC2)" # Type-A Port (left) - register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth - register "usb2_ports[6]" = "USB2_PORT_FLEX(OC_SKIP)" # Camera - register "usb2_ports[7]" = "USB2_PORT_FLEX(OC_SKIP)" # SD - - # OC0 should be for Type-C but it seems to not have been wired, according to - # the available schematics, even though it is labeled as USB_OC_TYPEC. - register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-C Port - register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC1)" # Type-A Port (right) - register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC1)" # Type-A Port (right) - register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-C Port - - device domain 0 on - device pci 1c.4 on end # PCI Express Port 5 - end -end -- cgit v1.2.3