diff --git a/src/mainboard/starlabs/labtop/Kconfig b/src/mainboard/starlabs/starbook/Kconfig similarity index 91% rename from src/mainboard/starlabs/labtop/Kconfig rename to src/mainboard/starlabs/starbook/Kconfig index e046648f3b..be2d339eb2 100644 --- a/src/mainboard/starlabs/labtop/Kconfig +++ b/src/mainboard/starlabs/starbook/Kconfig @@ -1,4 +1,4 @@ -config BOARD_STARLABS_LABTOP_SERIES +config BOARD_STARLABS_STARBOOK_SERIES def_bool n select DRIVERS_I2C_HID select EC_STARLABS_ITE @@ -15,7 +15,7 @@ config BOARD_STARLABS_LABTOP_SERIES config BOARD_STARLABS_LABTOP_KBL select BOARD_ROMSIZE_KB_8192 - select BOARD_STARLABS_LABTOP_SERIES + select BOARD_STARLABS_STARBOOK_SERIES select HAVE_INTEL_PTT select HAVE_SPD_IN_CBFS select MAINBOARD_HAS_LIBGFXINIT @@ -24,7 +24,7 @@ config BOARD_STARLABS_LABTOP_KBL config BOARD_STARLABS_LABTOP_CML select BOARD_ROMSIZE_KB_16384 - select BOARD_STARLABS_LABTOP_SERIES + select BOARD_STARLABS_STARBOOK_SERIES select EC_STARLABS_MAX_CHARGE select EC_STARLABS_NEED_ITE_BIN select HAVE_INTEL_PTT @@ -37,7 +37,7 @@ config BOARD_STARLABS_LABTOP_CML config BOARD_STARLABS_STARBOOK_TGL select BOARD_ROMSIZE_KB_16384 - select BOARD_STARLABS_LABTOP_SERIES + select BOARD_STARLABS_STARBOOK_SERIES select DRIVERS_INTEL_USB4_RETIMER select EC_STARLABS_KBL_LEVELS select EC_STARLABS_MAX_CHARGE @@ -51,7 +51,7 @@ config BOARD_STARLABS_STARBOOK_TGL select SOC_INTEL_TIGERLAKE_S3 select SPI_FLASH_WINBOND -if BOARD_STARLABS_LABTOP_SERIES +if BOARD_STARLABS_STARBOOK_SERIES config CCD_PORT int @@ -77,7 +77,7 @@ config EC_STARLABS_ADD_ITE_BIN config EC_STARLABS_ITE_BIN_PATH string depends on EC_STARLABS_NEED_ITE_BIN - default "3rdparty/blobs/mainboard/starlabs/starbook/\$(CONFIG_VARIANT_DIR)/ec.bin" + default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/\$(CONFIG_VARIANT_DIR)/ec.bin" config EC_VARIANT_DIR default "kbl" if !EC_STARLABS_MERLIN && BOARD_STARLABS_LABTOP_KBL @@ -92,7 +92,7 @@ config IFD_BIN_PATH default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/\$(CONFIG_VARIANT_DIR)/flashdescriptor.bin" config MAINBOARD_DIR - default "starlabs/labtop" + default "starlabs/starbook" config MAINBOARD_FAMILY string diff --git a/src/mainboard/starlabs/labtop/Kconfig.name b/src/mainboard/starlabs/starbook/Kconfig.name similarity index 87% rename from src/mainboard/starlabs/labtop/Kconfig.name rename to src/mainboard/starlabs/starbook/Kconfig.name index e1583d49c4..3db0d38554 100644 --- a/src/mainboard/starlabs/labtop/Kconfig.name +++ b/src/mainboard/starlabs/starbook/Kconfig.name @@ -1,4 +1,4 @@ -comment "Star Labs LabTop Series" +comment "Star Labs StarBook Series" config BOARD_STARLABS_LABTOP_KBL bool "Star Labs LabTop Mk III (i7-8550u)" diff --git a/src/mainboard/starlabs/labtop/Makefile.inc b/src/mainboard/starlabs/starbook/Makefile.inc similarity index 100% rename from src/mainboard/starlabs/labtop/Makefile.inc rename to src/mainboard/starlabs/starbook/Makefile.inc diff --git a/src/mainboard/starlabs/labtop/acpi/ec.asl b/src/mainboard/starlabs/starbook/acpi/ec.asl similarity index 100% rename from src/mainboard/starlabs/labtop/acpi/ec.asl rename to src/mainboard/starlabs/starbook/acpi/ec.asl diff --git a/src/mainboard/starlabs/labtop/acpi/mainboard.asl b/src/mainboard/starlabs/starbook/acpi/mainboard.asl similarity index 100% rename from src/mainboard/starlabs/labtop/acpi/mainboard.asl rename to src/mainboard/starlabs/starbook/acpi/mainboard.asl diff --git a/src/mainboard/starlabs/labtop/acpi/sleep.asl b/src/mainboard/starlabs/starbook/acpi/sleep.asl similarity index 100% rename from src/mainboard/starlabs/labtop/acpi/sleep.asl rename to src/mainboard/starlabs/starbook/acpi/sleep.asl diff --git a/src/mainboard/starlabs/labtop/acpi/superio.asl b/src/mainboard/starlabs/starbook/acpi/superio.asl similarity index 100% rename from src/mainboard/starlabs/labtop/acpi/superio.asl rename to src/mainboard/starlabs/starbook/acpi/superio.asl diff --git a/src/mainboard/starlabs/labtop/board_info.txt b/src/mainboard/starlabs/starbook/board_info.txt similarity index 81% rename from src/mainboard/starlabs/labtop/board_info.txt rename to src/mainboard/starlabs/starbook/board_info.txt index 9e70dba3d6..f03e7fdba2 100644 --- a/src/mainboard/starlabs/labtop/board_info.txt +++ b/src/mainboard/starlabs/starbook/board_info.txt @@ -1,5 +1,5 @@ Vendor name: Star Labs -Board name: LabTop +Board name: StarBook Category: laptop ROM protocol: SPI ROM socketed: n diff --git a/src/mainboard/starlabs/labtop/bootblock.c b/src/mainboard/starlabs/starbook/bootblock.c similarity index 100% rename from src/mainboard/starlabs/labtop/bootblock.c rename to src/mainboard/starlabs/starbook/bootblock.c diff --git a/src/mainboard/starlabs/labtop/cmos.default b/src/mainboard/starlabs/starbook/cmos.default similarity index 100% rename from src/mainboard/starlabs/labtop/cmos.default rename to src/mainboard/starlabs/starbook/cmos.default diff --git a/src/mainboard/starlabs/labtop/cmos.layout b/src/mainboard/starlabs/starbook/cmos.layout similarity index 100% rename from src/mainboard/starlabs/labtop/cmos.layout rename to src/mainboard/starlabs/starbook/cmos.layout diff --git a/src/mainboard/starlabs/labtop/dsdt.asl b/src/mainboard/starlabs/starbook/dsdt.asl similarity index 100% rename from src/mainboard/starlabs/labtop/dsdt.asl rename to src/mainboard/starlabs/starbook/dsdt.asl diff --git a/src/mainboard/starlabs/labtop/hda_verb.c b/src/mainboard/starlabs/starbook/hda_verb.c similarity index 100% rename from src/mainboard/starlabs/labtop/hda_verb.c rename to src/mainboard/starlabs/starbook/hda_verb.c diff --git a/src/mainboard/starlabs/labtop/include/variants.h b/src/mainboard/starlabs/starbook/include/variants.h similarity index 100% rename from src/mainboard/starlabs/labtop/include/variants.h rename to src/mainboard/starlabs/starbook/include/variants.h diff --git a/src/mainboard/starlabs/labtop/mainboard.c b/src/mainboard/starlabs/starbook/mainboard.c similarity index 100% rename from src/mainboard/starlabs/labtop/mainboard.c rename to src/mainboard/starlabs/starbook/mainboard.c diff --git a/src/mainboard/starlabs/labtop/smbios.c b/src/mainboard/starlabs/starbook/smbios.c similarity index 100% rename from src/mainboard/starlabs/labtop/smbios.c rename to src/mainboard/starlabs/starbook/smbios.c diff --git a/src/mainboard/starlabs/labtop/spd/Makefile.inc b/src/mainboard/starlabs/starbook/spd/Makefile.inc similarity index 100% rename from src/mainboard/starlabs/labtop/spd/Makefile.inc rename to src/mainboard/starlabs/starbook/spd/Makefile.inc diff --git a/src/mainboard/starlabs/labtop/spd/empty_ddr4.spd.hex b/src/mainboard/starlabs/starbook/spd/empty_ddr4.spd.hex similarity index 100% rename from src/mainboard/starlabs/labtop/spd/empty_ddr4.spd.hex rename to src/mainboard/starlabs/starbook/spd/empty_ddr4.spd.hex diff --git a/src/mainboard/starlabs/labtop/spd/micron-MT40A1G16KD-062E-E.spd.hex b/src/mainboard/starlabs/starbook/spd/micron-MT40A1G16KD-062E-E.spd.hex similarity index 100% rename from src/mainboard/starlabs/labtop/spd/micron-MT40A1G16KD-062E-E.spd.hex rename to src/mainboard/starlabs/starbook/spd/micron-MT40A1G16KD-062E-E.spd.hex diff --git a/src/mainboard/starlabs/labtop/spd/samsung-K4A8G165WB-BCRC.spd.hex b/src/mainboard/starlabs/starbook/spd/samsung-K4A8G165WB-BCRC.spd.hex similarity index 100% rename from src/mainboard/starlabs/labtop/spd/samsung-K4A8G165WB-BCRC.spd.hex rename to src/mainboard/starlabs/starbook/spd/samsung-K4A8G165WB-BCRC.spd.hex diff --git a/src/mainboard/starlabs/labtop/variants/cml/Makefile.inc b/src/mainboard/starlabs/starbook/variants/cml/Makefile.inc similarity index 100% rename from src/mainboard/starlabs/labtop/variants/cml/Makefile.inc rename to src/mainboard/starlabs/starbook/variants/cml/Makefile.inc diff --git a/src/mainboard/starlabs/labtop/variants/cml/board.fmd b/src/mainboard/starlabs/starbook/variants/cml/board.fmd similarity index 100% rename from src/mainboard/starlabs/labtop/variants/cml/board.fmd rename to src/mainboard/starlabs/starbook/variants/cml/board.fmd diff --git a/src/mainboard/starlabs/labtop/variants/cml/data.vbt b/src/mainboard/starlabs/starbook/variants/cml/data.vbt similarity index 100% rename from src/mainboard/starlabs/labtop/variants/cml/data.vbt rename to src/mainboard/starlabs/starbook/variants/cml/data.vbt diff --git a/src/mainboard/starlabs/labtop/variants/cml/devicetree.cb b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb similarity index 100% rename from src/mainboard/starlabs/labtop/variants/cml/devicetree.cb rename to src/mainboard/starlabs/starbook/variants/cml/devicetree.cb diff --git a/src/mainboard/starlabs/labtop/variants/cml/devtree.c b/src/mainboard/starlabs/starbook/variants/cml/devtree.c similarity index 100% rename from src/mainboard/starlabs/labtop/variants/cml/devtree.c rename to src/mainboard/starlabs/starbook/variants/cml/devtree.c diff --git a/src/mainboard/starlabs/labtop/variants/cml/gma-mainboard.ads b/src/mainboard/starlabs/starbook/variants/cml/gma-mainboard.ads similarity index 100% rename from src/mainboard/starlabs/labtop/variants/cml/gma-mainboard.ads rename to src/mainboard/starlabs/starbook/variants/cml/gma-mainboard.ads diff --git a/src/mainboard/starlabs/labtop/variants/cml/gpio.c b/src/mainboard/starlabs/starbook/variants/cml/gpio.c similarity index 100% rename from src/mainboard/starlabs/labtop/variants/cml/gpio.c rename to src/mainboard/starlabs/starbook/variants/cml/gpio.c diff --git a/src/mainboard/starlabs/labtop/variants/cml/hda_verb.c b/src/mainboard/starlabs/starbook/variants/cml/hda_verb.c similarity index 100% rename from src/mainboard/starlabs/labtop/variants/cml/hda_verb.c rename to src/mainboard/starlabs/starbook/variants/cml/hda_verb.c diff --git a/src/mainboard/starlabs/labtop/variants/cml/romstage.c b/src/mainboard/starlabs/starbook/variants/cml/romstage.c similarity index 100% rename from src/mainboard/starlabs/labtop/variants/cml/romstage.c rename to src/mainboard/starlabs/starbook/variants/cml/romstage.c diff --git a/src/mainboard/starlabs/labtop/variants/kbl/Makefile.inc b/src/mainboard/starlabs/starbook/variants/kbl/Makefile.inc similarity index 100% rename from src/mainboard/starlabs/labtop/variants/kbl/Makefile.inc rename to src/mainboard/starlabs/starbook/variants/kbl/Makefile.inc diff --git a/src/mainboard/starlabs/labtop/variants/kbl/board.fmd b/src/mainboard/starlabs/starbook/variants/kbl/board.fmd similarity index 100% rename from src/mainboard/starlabs/labtop/variants/kbl/board.fmd rename to src/mainboard/starlabs/starbook/variants/kbl/board.fmd diff --git a/src/mainboard/starlabs/labtop/variants/kbl/data.vbt b/src/mainboard/starlabs/starbook/variants/kbl/data.vbt similarity index 100% rename from src/mainboard/starlabs/labtop/variants/kbl/data.vbt rename to src/mainboard/starlabs/starbook/variants/kbl/data.vbt diff --git a/src/mainboard/starlabs/labtop/variants/kbl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/kbl/devicetree.cb similarity index 100% rename from src/mainboard/starlabs/labtop/variants/kbl/devicetree.cb rename to src/mainboard/starlabs/starbook/variants/kbl/devicetree.cb diff --git a/src/mainboard/starlabs/labtop/variants/kbl/devtree.c b/src/mainboard/starlabs/starbook/variants/kbl/devtree.c similarity index 100% rename from src/mainboard/starlabs/labtop/variants/kbl/devtree.c rename to src/mainboard/starlabs/starbook/variants/kbl/devtree.c diff --git a/src/mainboard/starlabs/labtop/variants/kbl/gma-mainboard.ads b/src/mainboard/starlabs/starbook/variants/kbl/gma-mainboard.ads similarity index 100% rename from src/mainboard/starlabs/labtop/variants/kbl/gma-mainboard.ads rename to src/mainboard/starlabs/starbook/variants/kbl/gma-mainboard.ads diff --git a/src/mainboard/starlabs/labtop/variants/kbl/gpio.c b/src/mainboard/starlabs/starbook/variants/kbl/gpio.c similarity index 100% rename from src/mainboard/starlabs/labtop/variants/kbl/gpio.c rename to src/mainboard/starlabs/starbook/variants/kbl/gpio.c diff --git a/src/mainboard/starlabs/labtop/variants/kbl/hda_verb.c b/src/mainboard/starlabs/starbook/variants/kbl/hda_verb.c similarity index 100% rename from src/mainboard/starlabs/labtop/variants/kbl/hda_verb.c rename to src/mainboard/starlabs/starbook/variants/kbl/hda_verb.c diff --git a/src/mainboard/starlabs/labtop/variants/kbl/romstage.c b/src/mainboard/starlabs/starbook/variants/kbl/romstage.c similarity index 100% rename from src/mainboard/starlabs/labtop/variants/kbl/romstage.c rename to src/mainboard/starlabs/starbook/variants/kbl/romstage.c diff --git a/src/mainboard/starlabs/labtop/variants/tgl/Makefile.inc b/src/mainboard/starlabs/starbook/variants/tgl/Makefile.inc similarity index 100% rename from src/mainboard/starlabs/labtop/variants/tgl/Makefile.inc rename to src/mainboard/starlabs/starbook/variants/tgl/Makefile.inc diff --git a/src/mainboard/starlabs/labtop/variants/tgl/board.fmd b/src/mainboard/starlabs/starbook/variants/tgl/board.fmd similarity index 100% rename from src/mainboard/starlabs/labtop/variants/tgl/board.fmd rename to src/mainboard/starlabs/starbook/variants/tgl/board.fmd diff --git a/src/mainboard/starlabs/labtop/variants/tgl/data.vbt b/src/mainboard/starlabs/starbook/variants/tgl/data.vbt similarity index 100% rename from src/mainboard/starlabs/labtop/variants/tgl/data.vbt rename to src/mainboard/starlabs/starbook/variants/tgl/data.vbt diff --git a/src/mainboard/starlabs/labtop/variants/tgl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb similarity index 100% rename from src/mainboard/starlabs/labtop/variants/tgl/devicetree.cb rename to src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb diff --git a/src/mainboard/starlabs/labtop/variants/tgl/devtree.c b/src/mainboard/starlabs/starbook/variants/tgl/devtree.c similarity index 100% rename from src/mainboard/starlabs/labtop/variants/tgl/devtree.c rename to src/mainboard/starlabs/starbook/variants/tgl/devtree.c diff --git a/src/mainboard/starlabs/labtop/variants/tgl/gpio.c b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c similarity index 100% rename from src/mainboard/starlabs/labtop/variants/tgl/gpio.c rename to src/mainboard/starlabs/starbook/variants/tgl/gpio.c diff --git a/src/mainboard/starlabs/labtop/variants/tgl/hda_verb.c b/src/mainboard/starlabs/starbook/variants/tgl/hda_verb.c similarity index 100% rename from src/mainboard/starlabs/labtop/variants/tgl/hda_verb.c rename to src/mainboard/starlabs/starbook/variants/tgl/hda_verb.c diff --git a/src/mainboard/starlabs/labtop/variants/tgl/romstage.c b/src/mainboard/starlabs/starbook/variants/tgl/romstage.c similarity index 100% rename from src/mainboard/starlabs/labtop/variants/tgl/romstage.c rename to src/mainboard/starlabs/starbook/variants/tgl/romstage.c