diff --git a/src/ec/starlabs/merlin/Kconfig b/src/ec/starlabs/merlin/Kconfig index 52690e33dc..d2f59a64fb 100644 --- a/src/ec/starlabs/merlin/Kconfig +++ b/src/ec/starlabs/merlin/Kconfig @@ -17,16 +17,9 @@ config EC_STARLABS_ITE KBL - 3.12 or later And open-source Merlin firmware version 1.00 or later -config EC_STARLABS_NEED_ITE_BIN - bool - depends on EC_STARLABS_ITE - help - Select if the mainboard requires EC firmware in the main flash chip. - config EC_STARLABS_ADD_ITE_BIN bool "Add Star Labs EC binary file" default n - depends on EC_STARLABS_NEED_ITE_BIN help Select to add an EC firmware binary into the coreboot image. EC firmware is necessary, flashing a coreboot image without EC firmware will render diff --git a/src/ec/starlabs/merlin/Makefile.mk b/src/ec/starlabs/merlin/Makefile.mk index 841b65959a..e1163c9f66 100644 --- a/src/ec/starlabs/merlin/Makefile.mk +++ b/src/ec/starlabs/merlin/Makefile.mk @@ -10,7 +10,6 @@ CPPFLAGS_common += -I$(src)/ec/starlabs/merlin/variants/$(EC_VARIANT_DIR) all-y += ite.c -ifeq ($(CONFIG_EC_STARLABS_NEED_ITE_BIN),y) ifeq ($(CONFIG_EC_STARLABS_ADD_ITE_BIN),y) add_ite_fw: $(obj)/coreboot.pre $(CBFSTOOL) $(obj)/coreboot.pre write -r EC -f $(CONFIG_EC_STARLABS_ITE_BIN_PATH) -u @@ -25,7 +24,6 @@ warn_no_ite_fw: printf "may not respond when you press it.\n\n" endif endif -endif ifeq ($(CONFIG_EC_STARLABS_NUVOTON),y) diff --git a/src/mainboard/starlabs/byte_adl/Kconfig b/src/mainboard/starlabs/byte_adl/Kconfig index 8054269b48..f3cc349142 100644 --- a/src/mainboard/starlabs/byte_adl/Kconfig +++ b/src/mainboard/starlabs/byte_adl/Kconfig @@ -9,7 +9,6 @@ config BOARD_STARLABS_BYTE_SERIES select DRIVERS_OPTION_CFR_ENABLED select EC_STARLABS_ITE select EC_STARLABS_MERLIN - select EC_STARLABS_NEED_ITE_BIN select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_INTEL_PTT @@ -57,7 +56,6 @@ config EC_GPE_SCI config EC_STARLABS_ITE_BIN_PATH string - depends on EC_STARLABS_NEED_ITE_BIN default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/\$(CONFIG_VARIANT_DIR)/ec.bin" config EC_VARIANT_DIR diff --git a/src/mainboard/starlabs/starbook/Kconfig b/src/mainboard/starlabs/starbook/Kconfig index b6bcc47f9b..0853c1873d 100644 --- a/src/mainboard/starlabs/starbook/Kconfig +++ b/src/mainboard/starlabs/starbook/Kconfig @@ -39,7 +39,6 @@ config BOARD_STARLABS_LABTOP_CML select EC_STARLABS_LID_SWITCH select EC_STARLABS_MAX_CHARGE select EC_STARLABS_MERLIN - select EC_STARLABS_NEED_ITE_BIN select HAVE_INTEL_PTT select HAVE_SPD_IN_CBFS select CRB_TPM @@ -57,7 +56,6 @@ config BOARD_STARLABS_STARBOOK_TGL select EC_STARLABS_LID_SWITCH select EC_STARLABS_MAX_CHARGE select EC_STARLABS_MERLIN - select EC_STARLABS_NEED_ITE_BIN select MAINBOARD_HAS_TPM2 select MEMORY_MAPPED_TPM select SOC_INTEL_COMMON_BLOCK_TCSS @@ -75,7 +73,6 @@ config BOARD_STARLABS_STARBOOK_ADL_COMMON select EC_STARLABS_LID_SWITCH select EC_STARLABS_MAX_CHARGE select EC_STARLABS_MERLIN - select EC_STARLABS_NEED_ITE_BIN select DRIVERS_GFX_GENERIC select MAINBOARD_HAS_TPM2 select MEMORY_MAPPED_TPM @@ -114,7 +111,6 @@ config BOARD_STARLABS_STARBOOK_MTL select EC_STARLABS_LID_SWITCH select EC_STARLABS_MAX_CHARGE select EC_STARLABS_MERLIN - select EC_STARLABS_NEED_ITE_BIN select MAINBOARD_HAS_TPM2 select MEMORY_MAPPED_TPM select PMC_IPC_ACPI_INTERFACE @@ -165,7 +161,6 @@ config EC_STARLABS_BATTERY_OEM config EC_STARLABS_ITE_BIN_PATH string - depends on EC_STARLABS_NEED_ITE_BIN default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/\$(CONFIG_VARIANT_DIR)/ec.bin" config EC_VARIANT_DIR diff --git a/src/mainboard/starlabs/starfighter/Kconfig b/src/mainboard/starlabs/starfighter/Kconfig index 8dfbf1b101..d29427f373 100644 --- a/src/mainboard/starlabs/starfighter/Kconfig +++ b/src/mainboard/starlabs/starfighter/Kconfig @@ -18,7 +18,6 @@ config BOARD_STARLABS_STARFIGHTER_SERIES select EC_STARLABS_LID_SWITCH select EC_STARLABS_MAX_CHARGE select EC_STARLABS_MERLIN - select EC_STARLABS_NEED_ITE_BIN select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_CMOS_DEFAULT @@ -78,7 +77,6 @@ config EC_STARLABS_BATTERY_OEM config EC_STARLABS_ITE_BIN_PATH string - depends on EC_STARLABS_NEED_ITE_BIN default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/\$(CONFIG_VARIANT_DIR)/ec.bin" config EC_VARIANT_DIR diff --git a/src/mainboard/starlabs/starlite_adl/Kconfig b/src/mainboard/starlabs/starlite_adl/Kconfig index ae86ef63dc..638fe72d0e 100644 --- a/src/mainboard/starlabs/starlite_adl/Kconfig +++ b/src/mainboard/starlabs/starlite_adl/Kconfig @@ -14,7 +14,6 @@ config BOARD_STARLABS_STARLITE_SERIES select EC_STARLABS_LID_SWITCH select EC_STARLABS_MAX_CHARGE select EC_STARLABS_MERLIN - select EC_STARLABS_NEED_ITE_BIN select EC_STARLABS_POWER_LED select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES @@ -71,7 +70,6 @@ config EC_STARLABS_BATTERY_OEM config EC_STARLABS_ITE_BIN_PATH string - depends on EC_STARLABS_NEED_ITE_BIN default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/\$(CONFIG_VARIANT_DIR)/ec.bin" config EC_VARIANT_DIR