From a8cf2f2d736172b7c7e88624f1439886ced5ecf4 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Tue, 26 Jul 2022 13:47:15 -0600 Subject: [PATCH] mb/system76/gaze16: Rename variant dir Use the actual model name for the variant dir. Change-Id: I199b8efb5c3cddb8943ba4b761546caa11c67a30 Signed-off-by: Tim Crawford Reviewed-on: https://review.coreboot.org/c/coreboot/+/66167 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Lean Sheng Tan --- src/mainboard/system76/gaze16/Kconfig | 4 ++-- .../gaze16/variants/{3050 => gaze16-3050}/data.vbt | Bin .../variants/{3050 => gaze16-3050}/hda_verb.c | 0 .../{3050 => gaze16-3050}/include/variant/gpio.h | 0 .../variants/{3050 => gaze16-3050}/overridetree.cb | 0 .../variants/{3050 => gaze16-3050}/ramstage.c | 0 .../variants/{3050 => gaze16-3050}/romstage.c | 0 .../gaze16/variants/{3060 => gaze16-3060}/data.vbt | Bin .../variants/{3060 => gaze16-3060}/hda_verb.c | 0 .../{3060 => gaze16-3060}/include/variant/gpio.h | 0 .../variants/{3060 => gaze16-3060}/overridetree.cb | 0 .../variants/{3060 => gaze16-3060}/ramstage.c | 0 .../variants/{3060 => gaze16-3060}/romstage.c | 0 13 files changed, 2 insertions(+), 2 deletions(-) rename src/mainboard/system76/gaze16/variants/{3050 => gaze16-3050}/data.vbt (100%) rename src/mainboard/system76/gaze16/variants/{3050 => gaze16-3050}/hda_verb.c (100%) rename src/mainboard/system76/gaze16/variants/{3050 => gaze16-3050}/include/variant/gpio.h (100%) rename src/mainboard/system76/gaze16/variants/{3050 => gaze16-3050}/overridetree.cb (100%) rename src/mainboard/system76/gaze16/variants/{3050 => gaze16-3050}/ramstage.c (100%) rename src/mainboard/system76/gaze16/variants/{3050 => gaze16-3050}/romstage.c (100%) rename src/mainboard/system76/gaze16/variants/{3060 => gaze16-3060}/data.vbt (100%) rename src/mainboard/system76/gaze16/variants/{3060 => gaze16-3060}/hda_verb.c (100%) rename src/mainboard/system76/gaze16/variants/{3060 => gaze16-3060}/include/variant/gpio.h (100%) rename src/mainboard/system76/gaze16/variants/{3060 => gaze16-3060}/overridetree.cb (100%) rename src/mainboard/system76/gaze16/variants/{3060 => gaze16-3060}/ramstage.c (100%) rename src/mainboard/system76/gaze16/variants/{3060 => gaze16-3060}/romstage.c (100%) diff --git a/src/mainboard/system76/gaze16/Kconfig b/src/mainboard/system76/gaze16/Kconfig index c8af2d4ca9..7d601382aa 100644 --- a/src/mainboard/system76/gaze16/Kconfig +++ b/src/mainboard/system76/gaze16/Kconfig @@ -42,8 +42,8 @@ config MAINBOARD_VERSION default "gaze16-3060-b" if BOARD_SYSTEM76_GAZE16_3060_B config VARIANT_DIR - default "3050" if BOARD_SYSTEM76_GAZE16_3050 - default "3060" if BOARD_SYSTEM76_GAZE16_3060 || BOARD_SYSTEM76_GAZE16_3060_B + default "gaze16-3050" if BOARD_SYSTEM76_GAZE16_3050 + default "gaze16-3060" if BOARD_SYSTEM76_GAZE16_3060 || BOARD_SYSTEM76_GAZE16_3060_B config OVERRIDE_DEVICETREE default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" diff --git a/src/mainboard/system76/gaze16/variants/3050/data.vbt b/src/mainboard/system76/gaze16/variants/gaze16-3050/data.vbt similarity index 100% rename from src/mainboard/system76/gaze16/variants/3050/data.vbt rename to src/mainboard/system76/gaze16/variants/gaze16-3050/data.vbt diff --git a/src/mainboard/system76/gaze16/variants/3050/hda_verb.c b/src/mainboard/system76/gaze16/variants/gaze16-3050/hda_verb.c similarity index 100% rename from src/mainboard/system76/gaze16/variants/3050/hda_verb.c rename to src/mainboard/system76/gaze16/variants/gaze16-3050/hda_verb.c diff --git a/src/mainboard/system76/gaze16/variants/3050/include/variant/gpio.h b/src/mainboard/system76/gaze16/variants/gaze16-3050/include/variant/gpio.h similarity index 100% rename from src/mainboard/system76/gaze16/variants/3050/include/variant/gpio.h rename to src/mainboard/system76/gaze16/variants/gaze16-3050/include/variant/gpio.h diff --git a/src/mainboard/system76/gaze16/variants/3050/overridetree.cb b/src/mainboard/system76/gaze16/variants/gaze16-3050/overridetree.cb similarity index 100% rename from src/mainboard/system76/gaze16/variants/3050/overridetree.cb rename to src/mainboard/system76/gaze16/variants/gaze16-3050/overridetree.cb diff --git a/src/mainboard/system76/gaze16/variants/3050/ramstage.c b/src/mainboard/system76/gaze16/variants/gaze16-3050/ramstage.c similarity index 100% rename from src/mainboard/system76/gaze16/variants/3050/ramstage.c rename to src/mainboard/system76/gaze16/variants/gaze16-3050/ramstage.c diff --git a/src/mainboard/system76/gaze16/variants/3050/romstage.c b/src/mainboard/system76/gaze16/variants/gaze16-3050/romstage.c similarity index 100% rename from src/mainboard/system76/gaze16/variants/3050/romstage.c rename to src/mainboard/system76/gaze16/variants/gaze16-3050/romstage.c diff --git a/src/mainboard/system76/gaze16/variants/3060/data.vbt b/src/mainboard/system76/gaze16/variants/gaze16-3060/data.vbt similarity index 100% rename from src/mainboard/system76/gaze16/variants/3060/data.vbt rename to src/mainboard/system76/gaze16/variants/gaze16-3060/data.vbt diff --git a/src/mainboard/system76/gaze16/variants/3060/hda_verb.c b/src/mainboard/system76/gaze16/variants/gaze16-3060/hda_verb.c similarity index 100% rename from src/mainboard/system76/gaze16/variants/3060/hda_verb.c rename to src/mainboard/system76/gaze16/variants/gaze16-3060/hda_verb.c diff --git a/src/mainboard/system76/gaze16/variants/3060/include/variant/gpio.h b/src/mainboard/system76/gaze16/variants/gaze16-3060/include/variant/gpio.h similarity index 100% rename from src/mainboard/system76/gaze16/variants/3060/include/variant/gpio.h rename to src/mainboard/system76/gaze16/variants/gaze16-3060/include/variant/gpio.h diff --git a/src/mainboard/system76/gaze16/variants/3060/overridetree.cb b/src/mainboard/system76/gaze16/variants/gaze16-3060/overridetree.cb similarity index 100% rename from src/mainboard/system76/gaze16/variants/3060/overridetree.cb rename to src/mainboard/system76/gaze16/variants/gaze16-3060/overridetree.cb diff --git a/src/mainboard/system76/gaze16/variants/3060/ramstage.c b/src/mainboard/system76/gaze16/variants/gaze16-3060/ramstage.c similarity index 100% rename from src/mainboard/system76/gaze16/variants/3060/ramstage.c rename to src/mainboard/system76/gaze16/variants/gaze16-3060/ramstage.c diff --git a/src/mainboard/system76/gaze16/variants/3060/romstage.c b/src/mainboard/system76/gaze16/variants/gaze16-3060/romstage.c similarity index 100% rename from src/mainboard/system76/gaze16/variants/3060/romstage.c rename to src/mainboard/system76/gaze16/variants/gaze16-3060/romstage.c