Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40912 )
Change subject: mb/purism/librem_skl: rename variant directories ......................................................................
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 --- M src/mainboard/purism/librem_skl/Kconfig R src/mainboard/purism/librem_skl/variants/librem13/board_info.txt R src/mainboard/purism/librem_skl/variants/librem13/overridetree.cb R src/mainboard/purism/librem_skl/variants/librem15/board_info.txt R src/mainboard/purism/librem_skl/variants/librem15/overridetree.cb 5 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/40912/1
diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig index be4c391..08fa4c7 100644 --- a/src/mainboard/purism/librem_skl/Kconfig +++ b/src/mainboard/purism/librem_skl/Kconfig @@ -20,8 +20,8 @@
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 similarity index 100% rename from src/mainboard/purism/librem_skl/variants/librem13v2/board_info.txt rename to 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 similarity index 100% rename from src/mainboard/purism/librem_skl/variants/librem13v2/overridetree.cb rename to 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 similarity index 100% rename from src/mainboard/purism/librem_skl/variants/librem15v3/board_info.txt rename to 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 similarity index 100% rename from src/mainboard/purism/librem_skl/variants/librem15v3/overridetree.cb rename to src/mainboard/purism/librem_skl/variants/librem15/overridetree.cb