diff options
author | Matt DeVillier <matt.devillier@puri.sm> | 2020-04-30 14:47:26 -0500 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2020-05-04 20:49:51 +0000 |
commit | 2b2f67fb7e3e6e7dd6360540c16a2cf8e52b7175 (patch) | |
tree | 7a136717bdcf604af6aa10f306efcf4a8bed6ec0 | |
parent | 57e37c58639f01b5249628425323f69770606fbf (diff) |
mb/purism/librem_skl: rename variant directories
Since the same variant dirs are used by multiple versions of the
same board, drop the v2/v3 labels.
Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
Change-Id: Id913e31ab52043e49769be9d3ebf6e71ecb0c856
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40912
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner
-rw-r--r-- | src/mainboard/purism/librem_skl/Kconfig | 4 | ||||
-rw-r--r-- | src/mainboard/purism/librem_skl/variants/librem13/board_info.txt (renamed from src/mainboard/purism/librem_skl/variants/librem13v2/board_info.txt) | 0 | ||||
-rw-r--r-- | src/mainboard/purism/librem_skl/variants/librem13/overridetree.cb (renamed from src/mainboard/purism/librem_skl/variants/librem13v2/overridetree.cb) | 0 | ||||
-rw-r--r-- | src/mainboard/purism/librem_skl/variants/librem15/board_info.txt (renamed from src/mainboard/purism/librem_skl/variants/librem15v3/board_info.txt) | 0 | ||||
-rw-r--r-- | src/mainboard/purism/librem_skl/variants/librem15/overridetree.cb (renamed from src/mainboard/purism/librem_skl/variants/librem15v3/overridetree.cb) | 0 |
5 files changed, 2 insertions, 2 deletions
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/librem13v2/board_info.txt b/src/mainboard/purism/librem_skl/variants/librem13/board_info.txt index fb0dd0bec8..fb0dd0bec8 100644 --- a/src/mainboard/purism/librem_skl/variants/librem13v2/board_info.txt +++ b/src/mainboard/purism/librem_skl/variants/librem13/board_info.txt diff --git a/src/mainboard/purism/librem_skl/variants/librem13v2/overridetree.cb b/src/mainboard/purism/librem_skl/variants/librem13/overridetree.cb index 18ce220753..18ce220753 100644 --- a/src/mainboard/purism/librem_skl/variants/librem13v2/overridetree.cb +++ b/src/mainboard/purism/librem_skl/variants/librem13/overridetree.cb diff --git a/src/mainboard/purism/librem_skl/variants/librem15v3/board_info.txt b/src/mainboard/purism/librem_skl/variants/librem15/board_info.txt index 9617bafc4b..9617bafc4b 100644 --- a/src/mainboard/purism/librem_skl/variants/librem15v3/board_info.txt +++ b/src/mainboard/purism/librem_skl/variants/librem15/board_info.txt diff --git a/src/mainboard/purism/librem_skl/variants/librem15v3/overridetree.cb b/src/mainboard/purism/librem_skl/variants/librem15/overridetree.cb index ab46cd3cd1..ab46cd3cd1 100644 --- a/src/mainboard/purism/librem_skl/variants/librem15v3/overridetree.cb +++ b/src/mainboard/purism/librem_skl/variants/librem15/overridetree.cb |