31 files changed, 5 insertions, 3 deletions
diff --git a/src/mainboard/system76/gaze16/Kconfig b/src/mainboard/system76/tgl-h/Kconfig
index 7d601382aa..cceb1ed374 100644
--- a/src/mainboard/system76/gaze16/Kconfig
+++ b/src/mainboard/system76/tgl-h/Kconfig
@@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select TPM_RDRESP_NEED_DELAY
 
 config MAINBOARD_DIR
-	default "system76/gaze16"
+	default "system76/tgl-h"
 
 config MAINBOARD_PART_NUMBER
 	default "gaze16-3050" if BOARD_SYSTEM76_GAZE16_3050
diff --git a/src/mainboard/system76/gaze16/Kconfig.name b/src/mainboard/system76/tgl-h/Kconfig.name
index 1ea29aeb12..1ea29aeb12 100644
--- a/src/mainboard/system76/gaze16/Kconfig.name
+++ b/src/mainboard/system76/tgl-h/Kconfig.name
diff --git a/src/mainboard/system76/gaze16/Makefile.inc b/src/mainboard/system76/tgl-h/Makefile.inc
index 6ade517c34..6ade517c34 100644
--- a/src/mainboard/system76/gaze16/Makefile.inc
+++ b/src/mainboard/system76/tgl-h/Makefile.inc
diff --git a/src/mainboard/system76/gaze16/acpi/mainboard.asl b/src/mainboard/system76/tgl-h/acpi/mainboard.asl
index 4675bc94b8..4675bc94b8 100644
--- a/src/mainboard/system76/gaze16/acpi/mainboard.asl
+++ b/src/mainboard/system76/tgl-h/acpi/mainboard.asl
diff --git a/src/mainboard/system76/gaze16/acpi/sleep.asl b/src/mainboard/system76/tgl-h/acpi/sleep.asl
index 83888f3e59..83888f3e59 100644
--- a/src/mainboard/system76/gaze16/acpi/sleep.asl
+++ b/src/mainboard/system76/tgl-h/acpi/sleep.asl
diff --git a/src/mainboard/system76/gaze16/board_info.txt b/src/mainboard/system76/tgl-h/board_info.txt
index 8b3be68b0b..badfb66706 100644
--- a/src/mainboard/system76/gaze16/board_info.txt
+++ b/src/mainboard/system76/tgl-h/board_info.txt
@@ -1,7 +1,5 @@
 Vendor name: System76
-Board name: gaze16
 Category: laptop
-Release year: 2021
 ROM package: SOIC-8
 ROM protocol: SPI
 ROM socketed: n
diff --git a/src/mainboard/system76/gaze16/bootblock.c b/src/mainboard/system76/tgl-h/bootblock.c
index 0dc25dd200..0dc25dd200 100644
--- a/src/mainboard/system76/gaze16/bootblock.c
+++ b/src/mainboard/system76/tgl-h/bootblock.c
diff --git a/src/mainboard/system76/gaze16/cmos.default b/src/mainboard/system76/tgl-h/cmos.default
index 0d376751c1..0d376751c1 100644
--- a/src/mainboard/system76/gaze16/cmos.default
+++ b/src/mainboard/system76/tgl-h/cmos.default
diff --git a/src/mainboard/system76/gaze16/cmos.layout b/src/mainboard/system76/tgl-h/cmos.layout
index a53c3f4bba..a53c3f4bba 100644
--- a/src/mainboard/system76/gaze16/cmos.layout
+++ b/src/mainboard/system76/tgl-h/cmos.layout
diff --git a/src/mainboard/system76/gaze16/devicetree.cb b/src/mainboard/system76/tgl-h/devicetree.cb
index e26fe629b4..e26fe629b4 100644
--- a/src/mainboard/system76/gaze16/devicetree.cb
+++ b/src/mainboard/system76/tgl-h/devicetree.cb
diff --git a/src/mainboard/system76/gaze16/dsdt.asl b/src/mainboard/system76/tgl-h/dsdt.asl
index a86fe9c6de..a86fe9c6de 100644
--- a/src/mainboard/system76/gaze16/dsdt.asl
+++ b/src/mainboard/system76/tgl-h/dsdt.asl
diff --git a/src/mainboard/system76/gaze16/include/variant/gpio.h b/src/mainboard/system76/tgl-h/include/variant/gpio.h
index 95d576294f..95d576294f 100644
--- a/src/mainboard/system76/gaze16/include/variant/gpio.h
+++ b/src/mainboard/system76/tgl-h/include/variant/gpio.h
diff --git a/src/mainboard/system76/gaze16/include/variant/romstage.h b/src/mainboard/system76/tgl-h/include/variant/romstage.h
index 9008cb95f2..9008cb95f2 100644
--- a/src/mainboard/system76/gaze16/include/variant/romstage.h
+++ b/src/mainboard/system76/tgl-h/include/variant/romstage.h
diff --git a/src/mainboard/system76/gaze16/ramstage.c b/src/mainboard/system76/tgl-h/ramstage.c
index 49b9934aed..49b9934aed 100644
--- a/src/mainboard/system76/gaze16/ramstage.c
+++ b/src/mainboard/system76/tgl-h/ramstage.c
diff --git a/src/mainboard/system76/gaze16/romstage.c b/src/mainboard/system76/tgl-h/romstage.c
index f69bae98eb..f69bae98eb 100644
--- a/src/mainboard/system76/gaze16/romstage.c
+++ b/src/mainboard/system76/tgl-h/romstage.c
diff --git a/src/mainboard/system76/tgl-h/variants/gaze16-3050/board_info.txt b/src/mainboard/system76/tgl-h/variants/gaze16-3050/board_info.txt
new file mode 100644
index 0000000000..6555d4d960
--- /dev/null
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3050/board_info.txt
@@ -0,0 +1,2 @@
+Board name: gaze16
+Release year: 2021
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/data.vbt b/src/mainboard/system76/tgl-h/variants/gaze16-3050/data.vbt
index 297522723c..297522723c 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3050/data.vbt
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3050/data.vbt
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/gpio.c b/src/mainboard/system76/tgl-h/variants/gaze16-3050/gpio.c
index 60b82de86f..60b82de86f 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3050/gpio.c
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3050/gpio.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/gpio_early.c b/src/mainboard/system76/tgl-h/variants/gaze16-3050/gpio_early.c
index 8c97e7f45e..8c97e7f45e 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3050/gpio_early.c
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3050/gpio_early.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/hda_verb.c b/src/mainboard/system76/tgl-h/variants/gaze16-3050/hda_verb.c
index 35c27a150f..35c27a150f 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3050/hda_verb.c
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3050/hda_verb.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/overridetree.cb b/src/mainboard/system76/tgl-h/variants/gaze16-3050/overridetree.cb
index 32f0805ac0..32f0805ac0 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3050/overridetree.cb
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3050/overridetree.cb
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/ramstage.c b/src/mainboard/system76/tgl-h/variants/gaze16-3050/ramstage.c
index 9d985630d0..9d985630d0 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3050/ramstage.c
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3050/ramstage.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/romstage.c b/src/mainboard/system76/tgl-h/variants/gaze16-3050/romstage.c
index f28c0c23d3..f28c0c23d3 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3050/romstage.c
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3050/romstage.c
diff --git a/src/mainboard/system76/tgl-h/variants/gaze16-3060/board_info.txt b/src/mainboard/system76/tgl-h/variants/gaze16-3060/board_info.txt
new file mode 100644
index 0000000000..6555d4d960
--- /dev/null
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3060/board_info.txt
@@ -0,0 +1,2 @@
+Board name: gaze16
+Release year: 2021
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/data.vbt b/src/mainboard/system76/tgl-h/variants/gaze16-3060/data.vbt
index 2531c7aed7..2531c7aed7 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3060/data.vbt
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3060/data.vbt
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/gpio.c b/src/mainboard/system76/tgl-h/variants/gaze16-3060/gpio.c
index ac14b64bf3..ac14b64bf3 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3060/gpio.c
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3060/gpio.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/gpio_early.c b/src/mainboard/system76/tgl-h/variants/gaze16-3060/gpio_early.c
index 8c97e7f45e..8c97e7f45e 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3060/gpio_early.c
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3060/gpio_early.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/hda_verb.c b/src/mainboard/system76/tgl-h/variants/gaze16-3060/hda_verb.c
index 491e32b2b1..491e32b2b1 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3060/hda_verb.c
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3060/hda_verb.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/overridetree.cb b/src/mainboard/system76/tgl-h/variants/gaze16-3060/overridetree.cb
index 881b2c5caf..881b2c5caf 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3060/overridetree.cb
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3060/overridetree.cb
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/ramstage.c b/src/mainboard/system76/tgl-h/variants/gaze16-3060/ramstage.c
index 0f83461ae4..0f83461ae4 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3060/ramstage.c
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3060/ramstage.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/romstage.c b/src/mainboard/system76/tgl-h/variants/gaze16-3060/romstage.c
index ed8397caf8..ed8397caf8 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3060/romstage.c
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3060/romstage.c