From d8796e50f322ea81fb61ebfce60f3f4d82d0bf2c Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 18 Jan 2024 10:49:48 -0700 Subject: ec: Rename Makefiles from .inc to .mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The .inc suffix is confusing to various tools as it's not specific to Makefiles. This means that editors don't recognize the files, and don't open them with highlighting and any other specific editor functionality. This issue is also seen in the release notes generation script where Makefiles get renamed before running cloc. Signed-off-by: Martin Roth Change-Id: Ic060f3605cd18d4bf774573c21957f626f984e2c Reviewed-on: https://review.coreboot.org/c/coreboot/+/80069 Reviewed-by: Felix Singer Reviewed-by: Maximilian Brune Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- src/ec/51nb/npce985la0dx/Makefile.inc | 22 ---- src/ec/51nb/npce985la0dx/Makefile.mk | 22 ++++ src/ec/acpi/Makefile.inc | 10 -- src/ec/acpi/Makefile.mk | 10 ++ src/ec/clevo/it5570e/Makefile.inc | 16 --- src/ec/clevo/it5570e/Makefile.mk | 16 +++ src/ec/compal/ene932/Makefile.inc | 8 -- src/ec/compal/ene932/Makefile.mk | 8 ++ src/ec/dell/mec5035/Makefile.inc | 9 -- src/ec/dell/mec5035/Makefile.mk | 9 ++ src/ec/google/chromeec/Makefile.inc | 138 ------------------------ src/ec/google/chromeec/Makefile.mk | 138 ++++++++++++++++++++++++ src/ec/google/chromeec/audio_codec/Makefile.inc | 2 - src/ec/google/chromeec/audio_codec/Makefile.mk | 2 + src/ec/google/chromeec/i2c_tunnel/Makefile.inc | 2 - src/ec/google/chromeec/i2c_tunnel/Makefile.mk | 2 + src/ec/google/chromeec/mux/Makefile.inc | 3 - src/ec/google/chromeec/mux/Makefile.mk | 3 + src/ec/google/chromeec/mux/conn/Makefile.inc | 2 - src/ec/google/chromeec/mux/conn/Makefile.mk | 2 + src/ec/google/common/Makefile.inc | 6 -- src/ec/google/common/Makefile.mk | 6 ++ src/ec/google/wilco/Makefile.inc | 10 -- src/ec/google/wilco/Makefile.mk | 10 ++ src/ec/hp/kbc1126/Makefile.inc | 35 ------ src/ec/hp/kbc1126/Makefile.mk | 35 ++++++ src/ec/intel/Makefile.inc | 7 -- src/ec/intel/Makefile.mk | 7 ++ src/ec/kontron/it8516e/Makefile.inc | 6 -- src/ec/kontron/it8516e/Makefile.mk | 6 ++ src/ec/kontron/kempld/Makefile.inc | 6 -- src/ec/kontron/kempld/Makefile.mk | 6 ++ src/ec/lenovo/h8/Makefile.inc | 27 ----- src/ec/lenovo/h8/Makefile.mk | 27 +++++ src/ec/lenovo/pmh7/Makefile.inc | 9 -- src/ec/lenovo/pmh7/Makefile.mk | 9 ++ src/ec/purism/librem-ec/Makefile.inc | 8 -- src/ec/purism/librem-ec/Makefile.mk | 8 ++ src/ec/quanta/ene_kb3940q/Makefile.inc | 8 -- src/ec/quanta/ene_kb3940q/Makefile.mk | 8 ++ src/ec/quanta/it8518/Makefile.inc | 9 -- src/ec/quanta/it8518/Makefile.mk | 9 ++ src/ec/roda/it8518/Makefile.inc | 3 - src/ec/roda/it8518/Makefile.mk | 3 + src/ec/smsc/mec1308/Makefile.inc | 7 -- src/ec/smsc/mec1308/Makefile.mk | 7 ++ src/ec/starlabs/merlin/Makefile.inc | 37 ------- src/ec/starlabs/merlin/Makefile.mk | 37 +++++++ src/ec/system76/ec/Makefile.inc | 10 -- src/ec/system76/ec/Makefile.mk | 10 ++ 50 files changed, 400 insertions(+), 400 deletions(-) delete mode 100644 src/ec/51nb/npce985la0dx/Makefile.inc create mode 100644 src/ec/51nb/npce985la0dx/Makefile.mk delete mode 100644 src/ec/acpi/Makefile.inc create mode 100644 src/ec/acpi/Makefile.mk delete mode 100644 src/ec/clevo/it5570e/Makefile.inc create mode 100644 src/ec/clevo/it5570e/Makefile.mk delete mode 100644 src/ec/compal/ene932/Makefile.inc create mode 100644 src/ec/compal/ene932/Makefile.mk delete mode 100644 src/ec/dell/mec5035/Makefile.inc create mode 100644 src/ec/dell/mec5035/Makefile.mk delete mode 100644 src/ec/google/chromeec/Makefile.inc create mode 100644 src/ec/google/chromeec/Makefile.mk delete mode 100644 src/ec/google/chromeec/audio_codec/Makefile.inc create mode 100644 src/ec/google/chromeec/audio_codec/Makefile.mk delete mode 100644 src/ec/google/chromeec/i2c_tunnel/Makefile.inc create mode 100644 src/ec/google/chromeec/i2c_tunnel/Makefile.mk delete mode 100644 src/ec/google/chromeec/mux/Makefile.inc create mode 100644 src/ec/google/chromeec/mux/Makefile.mk delete mode 100644 src/ec/google/chromeec/mux/conn/Makefile.inc create mode 100644 src/ec/google/chromeec/mux/conn/Makefile.mk delete mode 100644 src/ec/google/common/Makefile.inc create mode 100644 src/ec/google/common/Makefile.mk delete mode 100644 src/ec/google/wilco/Makefile.inc create mode 100644 src/ec/google/wilco/Makefile.mk delete mode 100644 src/ec/hp/kbc1126/Makefile.inc create mode 100644 src/ec/hp/kbc1126/Makefile.mk delete mode 100644 src/ec/intel/Makefile.inc create mode 100644 src/ec/intel/Makefile.mk delete mode 100644 src/ec/kontron/it8516e/Makefile.inc create mode 100644 src/ec/kontron/it8516e/Makefile.mk delete mode 100644 src/ec/kontron/kempld/Makefile.inc create mode 100644 src/ec/kontron/kempld/Makefile.mk delete mode 100644 src/ec/lenovo/h8/Makefile.inc create mode 100644 src/ec/lenovo/h8/Makefile.mk delete mode 100644 src/ec/lenovo/pmh7/Makefile.inc create mode 100644 src/ec/lenovo/pmh7/Makefile.mk delete mode 100644 src/ec/purism/librem-ec/Makefile.inc create mode 100644 src/ec/purism/librem-ec/Makefile.mk delete mode 100644 src/ec/quanta/ene_kb3940q/Makefile.inc create mode 100644 src/ec/quanta/ene_kb3940q/Makefile.mk delete mode 100644 src/ec/quanta/it8518/Makefile.inc create mode 100644 src/ec/quanta/it8518/Makefile.mk delete mode 100644 src/ec/roda/it8518/Makefile.inc create mode 100644 src/ec/roda/it8518/Makefile.mk delete mode 100644 src/ec/smsc/mec1308/Makefile.inc create mode 100644 src/ec/smsc/mec1308/Makefile.mk delete mode 100644 src/ec/starlabs/merlin/Makefile.inc create mode 100644 src/ec/starlabs/merlin/Makefile.mk delete mode 100644 src/ec/system76/ec/Makefile.inc create mode 100644 src/ec/system76/ec/Makefile.mk (limited to 'src/ec') diff --git a/src/ec/51nb/npce985la0dx/Makefile.inc b/src/ec/51nb/npce985la0dx/Makefile.inc deleted file mode 100644 index cef41aae27..0000000000 --- a/src/ec/51nb/npce985la0dx/Makefile.inc +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -ifeq ($(CONFIG_EC_51NB_NPCE985LA0DX),y) - -files_added:: -ifeq ($(CONFIG_EC_51NB_NPCE985LA0DX_FIRMWARE),y) - $(CBFSTOOL) $(obj)/coreboot.rom write -r EC -f $(CONFIG_EC_51NB_NPCE985LA0DX_FW) --fill-upward -endif - -show_notices:: -ifeq ($(CONFIG_EC_51NB_NPCE985LA0DX_FIRMWARE),) - printf "\n** WARNING **\n" - printf "You haven't added the firmware blobs for 51NB EC.\n" - printf "You may be unable to power on your laptop without these blobs.\n" - printf "Please select the following option to add them:\n\n" - printf " Chipset --->\n" - printf " [*] Add firmware images for 51NB EC\n\n" -endif - -ramstage-y += npce985la0dx.c - -endif diff --git a/src/ec/51nb/npce985la0dx/Makefile.mk b/src/ec/51nb/npce985la0dx/Makefile.mk new file mode 100644 index 0000000000..cef41aae27 --- /dev/null +++ b/src/ec/51nb/npce985la0dx/Makefile.mk @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +ifeq ($(CONFIG_EC_51NB_NPCE985LA0DX),y) + +files_added:: +ifeq ($(CONFIG_EC_51NB_NPCE985LA0DX_FIRMWARE),y) + $(CBFSTOOL) $(obj)/coreboot.rom write -r EC -f $(CONFIG_EC_51NB_NPCE985LA0DX_FW) --fill-upward +endif + +show_notices:: +ifeq ($(CONFIG_EC_51NB_NPCE985LA0DX_FIRMWARE),) + printf "\n** WARNING **\n" + printf "You haven't added the firmware blobs for 51NB EC.\n" + printf "You may be unable to power on your laptop without these blobs.\n" + printf "Please select the following option to add them:\n\n" + printf " Chipset --->\n" + printf " [*] Add firmware images for 51NB EC\n\n" +endif + +ramstage-y += npce985la0dx.c + +endif diff --git a/src/ec/acpi/Makefile.inc b/src/ec/acpi/Makefile.inc deleted file mode 100644 index b3eb1036ec..0000000000 --- a/src/ec/acpi/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ifeq ($(CONFIG_EC_ACPI),y) - -bootblock-y += ec.c -verstage-y += ec.c -romstage-y += ec.c -ramstage-y += ec.c -smm-y += ec.c - -endif diff --git a/src/ec/acpi/Makefile.mk b/src/ec/acpi/Makefile.mk new file mode 100644 index 0000000000..b3eb1036ec --- /dev/null +++ b/src/ec/acpi/Makefile.mk @@ -0,0 +1,10 @@ +## SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_EC_ACPI),y) + +bootblock-y += ec.c +verstage-y += ec.c +romstage-y += ec.c +ramstage-y += ec.c +smm-y += ec.c + +endif diff --git a/src/ec/clevo/it5570e/Makefile.inc b/src/ec/clevo/it5570e/Makefile.inc deleted file mode 100644 index 46d97d2dc6..0000000000 --- a/src/ec/clevo/it5570e/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -ifeq ($(CONFIG_EC_CLEVO_IT5570E),y) - -bootblock-y += early_init.c -bootblock-y += i2ec.c - -ramstage-y += ec.c -ramstage-y += commands.c -ramstage-y += smbios.c -ramstage-y += ssdt.c - -smm-y += commands.c -smm-y += smihandler.c - -endif diff --git a/src/ec/clevo/it5570e/Makefile.mk b/src/ec/clevo/it5570e/Makefile.mk new file mode 100644 index 0000000000..46d97d2dc6 --- /dev/null +++ b/src/ec/clevo/it5570e/Makefile.mk @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only + +ifeq ($(CONFIG_EC_CLEVO_IT5570E),y) + +bootblock-y += early_init.c +bootblock-y += i2ec.c + +ramstage-y += ec.c +ramstage-y += commands.c +ramstage-y += smbios.c +ramstage-y += ssdt.c + +smm-y += commands.c +smm-y += smihandler.c + +endif diff --git a/src/ec/compal/ene932/Makefile.inc b/src/ec/compal/ene932/Makefile.inc deleted file mode 100644 index 6af2a1c58e..0000000000 --- a/src/ec/compal/ene932/Makefile.inc +++ /dev/null @@ -1,8 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ifeq ($(CONFIG_EC_COMPAL_ENE932),y) - -ramstage-y += ec.c -smm-y += ec.c -smm-y += ../../../lib/delay.c - -endif diff --git a/src/ec/compal/ene932/Makefile.mk b/src/ec/compal/ene932/Makefile.mk new file mode 100644 index 0000000000..6af2a1c58e --- /dev/null +++ b/src/ec/compal/ene932/Makefile.mk @@ -0,0 +1,8 @@ +## SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_EC_COMPAL_ENE932),y) + +ramstage-y += ec.c +smm-y += ec.c +smm-y += ../../../lib/delay.c + +endif diff --git a/src/ec/dell/mec5035/Makefile.inc b/src/ec/dell/mec5035/Makefile.inc deleted file mode 100644 index 4ebdd811f9..0000000000 --- a/src/ec/dell/mec5035/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ifeq ($(CONFIG_EC_DELL_MEC5035),y) - -bootblock-y += mec5035.c -romstage-y += mec5035.c -ramstage-y += mec5035.c - -endif diff --git a/src/ec/dell/mec5035/Makefile.mk b/src/ec/dell/mec5035/Makefile.mk new file mode 100644 index 0000000000..4ebdd811f9 --- /dev/null +++ b/src/ec/dell/mec5035/Makefile.mk @@ -0,0 +1,9 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ifeq ($(CONFIG_EC_DELL_MEC5035),y) + +bootblock-y += mec5035.c +romstage-y += mec5035.c +ramstage-y += mec5035.c + +endif diff --git a/src/ec/google/chromeec/Makefile.inc b/src/ec/google/chromeec/Makefile.inc deleted file mode 100644 index 1cf88f260b..0000000000 --- a/src/ec/google/chromeec/Makefile.inc +++ /dev/null @@ -1,138 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ifeq ($(CONFIG_EC_GOOGLE_CHROMEEC),y) - -subdirs-y += audio_codec -subdirs-y += i2c_tunnel -subdirs-y += mux - -bootblock-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c -verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c -romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c -smm-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c - -smm-$(CONFIG_EC_GOOGLE_CHROMEEC_SKUID) += ec_skuid.c -romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SKUID) += ec_skuid.c -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SKUID) += ec_skuid.c - -ifeq ($(CONFIG_GENERATE_SMBIOS_TABLES),y) -romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SKUID) += ec_smbios.c -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SKUID) += ec_smbios.c -endif - -bootblock-y += ec.c -bootblock-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c -ramstage-y += ec.c crosec_proto.c vstore.c usbc_mux.c -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c -smm-y += ec.c crosec_proto.c smihandler.c vstore.c -smm-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c -smm-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c -smm-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c -romstage-y += ec.c crosec_proto.c vstore.c -romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c -romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c -romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c -verstage-y += ec.c crosec_proto.c vstore.c -verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c -verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c -verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c -ramstage-$(CONFIG_HAVE_ACPI_TABLES) += ec_acpi.c - -ramstage-$(CONFIG_VBOOT) += vboot_storage.c -smm-$(CONFIG_VBOOT) += vboot_storage.c -romstage-$(CONFIG_VBOOT) += vboot_storage.c -verstage-$(CONFIG_VBOOT) += vboot_storage.c - -verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SWITCHES) += switches.c -romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SWITCHES) += switches.c -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SWITCHES) += switches.c - -ramstage-$(CONFIG_DRIVERS_INTEL_DPTF) += ec_dptf_helpers.c - -CHROMEEC_SOURCE ?= $(top)/3rdparty/chromeec - -# These are Chrome EC firmware images that a payload (such as depthcharge) can -# use to update the EC. ecrw is the main embedded controller's firmware, -# pdrw is for a USB PD controller. - -ifneq ($(CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_NONE),y) - -cbfs-files-y += ecrw -ecrw-file := $(obj)/mainboard/$(MAINBOARDDIR)/ecrw -ecrw-name := ecrw -ecrw-type := raw -ecrw-compression := $(CBFS_COMPRESS_FLAG) -cbfs-files-y += ecrw.hash -ecrw.hash-file := $(obj)/mainboard/$(MAINBOARDDIR)/ecrw.hash -ecrw.hash-name := ecrw.hash -ecrw.hash-type := raw - -ifeq ($(CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL),y) -CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE := $(call strip_quotes,$(CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE)) - -$(obj)/mainboard/$(MAINBOARDDIR)/ecrw: $(CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE) - cp $(CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE) $@ -else -CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME := $(call strip_quotes,$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME)) - -$(obj)/mainboard/$(MAINBOARDDIR)/ecrw: - $(MAKE) -C $(CHROMEEC_SOURCE) $(if $(CONFIG_CCACHE),,CCACHE=) \ - out=$(abspath $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME)) \ - REPRODUCIBLE_BUILD=1 \ - CC=$(GCC_CC_arm) \ - CROSS_COMPILE=$(subst -cpp,-,$(CPP_arm)) \ - HOST_CROSS_COMPILE= \ - BOARD=$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME) \ - rw - cp $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME)/RW/ec.RW.flat $@ -endif - -$(obj)/mainboard/$(MAINBOARDDIR)/ecrw.hash: $(obj)/mainboard/$(MAINBOARDDIR)/ecrw - openssl dgst -sha256 -binary $< > $@ - -endif - -ifeq ($(CONFIG_EC_GOOGLE_CHROMEEC_PD),y) - -ifneq ($(CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_NONE),y) - -cbfs-files-y += pdrw -pdrw-file := $(obj)/mainboard/$(MAINBOARDDIR)/pdrw -pdrw-name := pdrw -pdrw-type := raw -pdrw-compression := $(CBFS_COMPRESS_FLAG) -cbfs-files-y += pdrw.hash -pdrw.hash-file := $(obj)/mainboard/$(MAINBOARDDIR)/pdrw.hash -pdrw.hash-name := pdrw.hash -pdrw.hash-type := raw - -ifeq ($(CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_EXTERNAL),y) -CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_FILE := $(call strip_quotes,$(CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_FILE)) - -$(obj)/mainboard/$(MAINBOARDDIR)/pdrw: $(CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_FILE) - cp $(CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_FILE) $@ -else -CONFIG_EC_GOOGLE_CHROMEEC_PD_BOARDNAME := $(call strip_quotes,$(CONFIG_EC_GOOGLE_CHROMEEC_PD_BOARDNAME)) - -$(obj)/mainboard/$(MAINBOARDDIR)/pdrw: - $(MAKE) -C $(CHROMEEC_SOURCE) $(if $(CONFIG_CCACHE),,CCACHE=) \ - out=$(abspath $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_PD_BOARDNAME)) \ - REPRODUCIBLE_BUILD=1 \ - CC=$(GCC_CC_arm) \ - CROSS_COMPILE=$(subst -cpp,-,$(CPP_arm)) \ - HOST_CROSS_COMPILE= \ - BOARD=$(CONFIG_EC_GOOGLE_CHROMEEC_PD_BOARDNAME) \ - rw - cp $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_PD_BOARDNAME)/RW/ec.RW.flat $@ -endif - -$(obj)/mainboard/$(MAINBOARDDIR)/pdrw.hash: $(obj)/mainboard/$(MAINBOARDDIR)/pdrw - openssl dgst -sha256 -binary $< > $@ - -endif - -endif - -endif diff --git a/src/ec/google/chromeec/Makefile.mk b/src/ec/google/chromeec/Makefile.mk new file mode 100644 index 0000000000..1cf88f260b --- /dev/null +++ b/src/ec/google/chromeec/Makefile.mk @@ -0,0 +1,138 @@ +## SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_EC_GOOGLE_CHROMEEC),y) + +subdirs-y += audio_codec +subdirs-y += i2c_tunnel +subdirs-y += mux + +bootblock-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c +verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c +romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c +smm-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c + +smm-$(CONFIG_EC_GOOGLE_CHROMEEC_SKUID) += ec_skuid.c +romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SKUID) += ec_skuid.c +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SKUID) += ec_skuid.c + +ifeq ($(CONFIG_GENERATE_SMBIOS_TABLES),y) +romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SKUID) += ec_smbios.c +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SKUID) += ec_smbios.c +endif + +bootblock-y += ec.c +bootblock-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c +ramstage-y += ec.c crosec_proto.c vstore.c usbc_mux.c +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c +smm-y += ec.c crosec_proto.c smihandler.c vstore.c +smm-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c +smm-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c +smm-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c +romstage-y += ec.c crosec_proto.c vstore.c +romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c +romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c +romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c +verstage-y += ec.c crosec_proto.c vstore.c +verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C) += ec_i2c.c +verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c +verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SPI) += ec_spi.c +ramstage-$(CONFIG_HAVE_ACPI_TABLES) += ec_acpi.c + +ramstage-$(CONFIG_VBOOT) += vboot_storage.c +smm-$(CONFIG_VBOOT) += vboot_storage.c +romstage-$(CONFIG_VBOOT) += vboot_storage.c +verstage-$(CONFIG_VBOOT) += vboot_storage.c + +verstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SWITCHES) += switches.c +romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SWITCHES) += switches.c +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_SWITCHES) += switches.c + +ramstage-$(CONFIG_DRIVERS_INTEL_DPTF) += ec_dptf_helpers.c + +CHROMEEC_SOURCE ?= $(top)/3rdparty/chromeec + +# These are Chrome EC firmware images that a payload (such as depthcharge) can +# use to update the EC. ecrw is the main embedded controller's firmware, +# pdrw is for a USB PD controller. + +ifneq ($(CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_NONE),y) + +cbfs-files-y += ecrw +ecrw-file := $(obj)/mainboard/$(MAINBOARDDIR)/ecrw +ecrw-name := ecrw +ecrw-type := raw +ecrw-compression := $(CBFS_COMPRESS_FLAG) +cbfs-files-y += ecrw.hash +ecrw.hash-file := $(obj)/mainboard/$(MAINBOARDDIR)/ecrw.hash +ecrw.hash-name := ecrw.hash +ecrw.hash-type := raw + +ifeq ($(CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL),y) +CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE := $(call strip_quotes,$(CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE)) + +$(obj)/mainboard/$(MAINBOARDDIR)/ecrw: $(CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE) + cp $(CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE) $@ +else +CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME := $(call strip_quotes,$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME)) + +$(obj)/mainboard/$(MAINBOARDDIR)/ecrw: + $(MAKE) -C $(CHROMEEC_SOURCE) $(if $(CONFIG_CCACHE),,CCACHE=) \ + out=$(abspath $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME)) \ + REPRODUCIBLE_BUILD=1 \ + CC=$(GCC_CC_arm) \ + CROSS_COMPILE=$(subst -cpp,-,$(CPP_arm)) \ + HOST_CROSS_COMPILE= \ + BOARD=$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME) \ + rw + cp $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDNAME)/RW/ec.RW.flat $@ +endif + +$(obj)/mainboard/$(MAINBOARDDIR)/ecrw.hash: $(obj)/mainboard/$(MAINBOARDDIR)/ecrw + openssl dgst -sha256 -binary $< > $@ + +endif + +ifeq ($(CONFIG_EC_GOOGLE_CHROMEEC_PD),y) + +ifneq ($(CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_NONE),y) + +cbfs-files-y += pdrw +pdrw-file := $(obj)/mainboard/$(MAINBOARDDIR)/pdrw +pdrw-name := pdrw +pdrw-type := raw +pdrw-compression := $(CBFS_COMPRESS_FLAG) +cbfs-files-y += pdrw.hash +pdrw.hash-file := $(obj)/mainboard/$(MAINBOARDDIR)/pdrw.hash +pdrw.hash-name := pdrw.hash +pdrw.hash-type := raw + +ifeq ($(CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_EXTERNAL),y) +CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_FILE := $(call strip_quotes,$(CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_FILE)) + +$(obj)/mainboard/$(MAINBOARDDIR)/pdrw: $(CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_FILE) + cp $(CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_FILE) $@ +else +CONFIG_EC_GOOGLE_CHROMEEC_PD_BOARDNAME := $(call strip_quotes,$(CONFIG_EC_GOOGLE_CHROMEEC_PD_BOARDNAME)) + +$(obj)/mainboard/$(MAINBOARDDIR)/pdrw: + $(MAKE) -C $(CHROMEEC_SOURCE) $(if $(CONFIG_CCACHE),,CCACHE=) \ + out=$(abspath $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_PD_BOARDNAME)) \ + REPRODUCIBLE_BUILD=1 \ + CC=$(GCC_CC_arm) \ + CROSS_COMPILE=$(subst -cpp,-,$(CPP_arm)) \ + HOST_CROSS_COMPILE= \ + BOARD=$(CONFIG_EC_GOOGLE_CHROMEEC_PD_BOARDNAME) \ + rw + cp $(obj)/external/chromeec/$(CONFIG_EC_GOOGLE_CHROMEEC_PD_BOARDNAME)/RW/ec.RW.flat $@ +endif + +$(obj)/mainboard/$(MAINBOARDDIR)/pdrw.hash: $(obj)/mainboard/$(MAINBOARDDIR)/pdrw + openssl dgst -sha256 -binary $< > $@ + +endif + +endif + +endif diff --git a/src/ec/google/chromeec/audio_codec/Makefile.inc b/src/ec/google/chromeec/audio_codec/Makefile.inc deleted file mode 100644 index 0152935b85..0000000000 --- a/src/ec/google/chromeec/audio_codec/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_AUDIO_CODEC) += audio_codec.c diff --git a/src/ec/google/chromeec/audio_codec/Makefile.mk b/src/ec/google/chromeec/audio_codec/Makefile.mk new file mode 100644 index 0000000000..0152935b85 --- /dev/null +++ b/src/ec/google/chromeec/audio_codec/Makefile.mk @@ -0,0 +1,2 @@ +## SPDX-License-Identifier: GPL-2.0-only +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_AUDIO_CODEC) += audio_codec.c diff --git a/src/ec/google/chromeec/i2c_tunnel/Makefile.inc b/src/ec/google/chromeec/i2c_tunnel/Makefile.inc deleted file mode 100644 index 81b91afec1..0000000000 --- a/src/ec/google/chromeec/i2c_tunnel/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C_TUNNEL) += i2c_tunnel.c diff --git a/src/ec/google/chromeec/i2c_tunnel/Makefile.mk b/src/ec/google/chromeec/i2c_tunnel/Makefile.mk new file mode 100644 index 0000000000..81b91afec1 --- /dev/null +++ b/src/ec/google/chromeec/i2c_tunnel/Makefile.mk @@ -0,0 +1,2 @@ +## SPDX-License-Identifier: GPL-2.0-only +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_I2C_TUNNEL) += i2c_tunnel.c diff --git a/src/ec/google/chromeec/mux/Makefile.inc b/src/ec/google/chromeec/mux/Makefile.inc deleted file mode 100644 index 58529aeb0a..0000000000 --- a/src/ec/google/chromeec/mux/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -subdirs-y += conn -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_MUX) += mux.c diff --git a/src/ec/google/chromeec/mux/Makefile.mk b/src/ec/google/chromeec/mux/Makefile.mk new file mode 100644 index 0000000000..58529aeb0a --- /dev/null +++ b/src/ec/google/chromeec/mux/Makefile.mk @@ -0,0 +1,3 @@ +## SPDX-License-Identifier: GPL-2.0-only +subdirs-y += conn +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_MUX) += mux.c diff --git a/src/ec/google/chromeec/mux/conn/Makefile.inc b/src/ec/google/chromeec/mux/conn/Makefile.inc deleted file mode 100644 index 795baa96e4..0000000000 --- a/src/ec/google/chromeec/mux/conn/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_MUX) += conn.c diff --git a/src/ec/google/chromeec/mux/conn/Makefile.mk b/src/ec/google/chromeec/mux/conn/Makefile.mk new file mode 100644 index 0000000000..795baa96e4 --- /dev/null +++ b/src/ec/google/chromeec/mux/conn/Makefile.mk @@ -0,0 +1,2 @@ +## SPDX-License-Identifier: GPL-2.0-only +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_MUX) += conn.c diff --git a/src/ec/google/common/Makefile.inc b/src/ec/google/common/Makefile.inc deleted file mode 100644 index e1e5dfcf22..0000000000 --- a/src/ec/google/common/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -bootblock-$(CONFIG_EC_GOOGLE_COMMON_MEC) += mec.c -verstage-$(CONFIG_EC_GOOGLE_COMMON_MEC) += mec.c -romstage-$(CONFIG_EC_GOOGLE_COMMON_MEC) += mec.c -ramstage-$(CONFIG_EC_GOOGLE_COMMON_MEC) += mec.c -smm-$(CONFIG_EC_GOOGLE_COMMON_MEC) += mec.c diff --git a/src/ec/google/common/Makefile.mk b/src/ec/google/common/Makefile.mk new file mode 100644 index 0000000000..e1e5dfcf22 --- /dev/null +++ b/src/ec/google/common/Makefile.mk @@ -0,0 +1,6 @@ +## SPDX-License-Identifier: GPL-2.0-only +bootblock-$(CONFIG_EC_GOOGLE_COMMON_MEC) += mec.c +verstage-$(CONFIG_EC_GOOGLE_COMMON_MEC) += mec.c +romstage-$(CONFIG_EC_GOOGLE_COMMON_MEC) += mec.c +ramstage-$(CONFIG_EC_GOOGLE_COMMON_MEC) += mec.c +smm-$(CONFIG_EC_GOOGLE_COMMON_MEC) += mec.c diff --git a/src/ec/google/wilco/Makefile.inc b/src/ec/google/wilco/Makefile.inc deleted file mode 100644 index 77eab67f03..0000000000 --- a/src/ec/google/wilco/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ifeq ($(CONFIG_EC_GOOGLE_WILCO),y) - -bootblock-y += bootblock.c commands.c mailbox.c -verstage-y += commands.c mailbox.c -romstage-y += commands.c mailbox.c romstage.c boardid.c -ramstage-y += chip.c commands.c mailbox.c boardid.c -smm-y += commands.c mailbox.c smihandler.c boardid.c - -endif diff --git a/src/ec/google/wilco/Makefile.mk b/src/ec/google/wilco/Makefile.mk new file mode 100644 index 0000000000..77eab67f03 --- /dev/null +++ b/src/ec/google/wilco/Makefile.mk @@ -0,0 +1,10 @@ +## SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_EC_GOOGLE_WILCO),y) + +bootblock-y += bootblock.c commands.c mailbox.c +verstage-y += commands.c mailbox.c +romstage-y += commands.c mailbox.c romstage.c boardid.c +ramstage-y += chip.c commands.c mailbox.c boardid.c +smm-y += commands.c mailbox.c smihandler.c boardid.c + +endif diff --git a/src/ec/hp/kbc1126/Makefile.inc b/src/ec/hp/kbc1126/Makefile.inc deleted file mode 100644 index 5f22e132e2..0000000000 --- a/src/ec/hp/kbc1126/Makefile.inc +++ /dev/null @@ -1,35 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ifeq ($(CONFIG_EC_HP_KBC1126_ECFW_IN_CBFS),y) - -bootblock-y += ecfw_ptr.c - -ifeq ($(CONFIG_KBC1126_FIRMWARE),y) -cbfs-files-y += ecfw1.bin -cbfs-files-y += ecfw2.bin - -ecfw1.bin-file := $(call strip_quotes,$(CONFIG_KBC1126_FW1)) -ecfw1.bin-position := $(CONFIG_KBC1126_FW1_OFFSET) -ecfw1.bin-type := raw - -ecfw2.bin-file := $(call strip_quotes,$(CONFIG_KBC1126_FW2)) -ecfw2.bin-position := $(CONFIG_KBC1126_FW2_OFFSET) -ecfw2.bin-type := raw -endif - -show_notices:: -ifeq ($(CONFIG_KBC1126_FIRMWARE),) - printf "\n** WARNING **\n" - printf "You haven't added the firmware blobs for KBC1126 EC.\n" - printf "You may be unable to power on your laptop without these blobs.\n" - printf "Please select the following option to add them:\n\n" - printf " Chipset --->\n" - printf " [*] Add firmware images for KBC1126 EC\n\n" - printf "You can read util/kbc1126/README.md for details.\n\n" -endif - -endif - -ramstage-$(CONFIG_EC_HP_KBC1126) += ec.c -bootblock-$(CONFIG_EC_HP_KBC1126) += early_init.c -romstage-$(CONFIG_EC_HP_KBC1126) += early_init.c diff --git a/src/ec/hp/kbc1126/Makefile.mk b/src/ec/hp/kbc1126/Makefile.mk new file mode 100644 index 0000000000..5f22e132e2 --- /dev/null +++ b/src/ec/hp/kbc1126/Makefile.mk @@ -0,0 +1,35 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ifeq ($(CONFIG_EC_HP_KBC1126_ECFW_IN_CBFS),y) + +bootblock-y += ecfw_ptr.c + +ifeq ($(CONFIG_KBC1126_FIRMWARE),y) +cbfs-files-y += ecfw1.bin +cbfs-files-y += ecfw2.bin + +ecfw1.bin-file := $(call strip_quotes,$(CONFIG_KBC1126_FW1)) +ecfw1.bin-position := $(CONFIG_KBC1126_FW1_OFFSET) +ecfw1.bin-type := raw + +ecfw2.bin-file := $(call strip_quotes,$(CONFIG_KBC1126_FW2)) +ecfw2.bin-position := $(CONFIG_KBC1126_FW2_OFFSET) +ecfw2.bin-type := raw +endif + +show_notices:: +ifeq ($(CONFIG_KBC1126_FIRMWARE),) + printf "\n** WARNING **\n" + printf "You haven't added the firmware blobs for KBC1126 EC.\n" + printf "You may be unable to power on your laptop without these blobs.\n" + printf "Please select the following option to add them:\n\n" + printf " Chipset --->\n" + printf " [*] Add firmware images for KBC1126 EC\n\n" + printf "You can read util/kbc1126/README.md for details.\n\n" +endif + +endif + +ramstage-$(CONFIG_EC_HP_KBC1126) += ec.c +bootblock-$(CONFIG_EC_HP_KBC1126) += early_init.c +romstage-$(CONFIG_EC_HP_KBC1126) += early_init.c diff --git a/src/ec/intel/Makefile.inc b/src/ec/intel/Makefile.inc deleted file mode 100644 index 46c07a74a8..0000000000 --- a/src/ec/intel/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-or-later - -bootblock-y += board_id.c -romstage-y += board_id.c -ramstage-y += board_id.c - -CPPFLAGS_common += -I$(src)/ec/intel diff --git a/src/ec/intel/Makefile.mk b/src/ec/intel/Makefile.mk new file mode 100644 index 0000000000..46c07a74a8 --- /dev/null +++ b/src/ec/intel/Makefile.mk @@ -0,0 +1,7 @@ +## SPDX-License-Identifier: GPL-2.0-or-later + +bootblock-y += board_id.c +romstage-y += board_id.c +ramstage-y += board_id.c + +CPPFLAGS_common += -I$(src)/ec/intel diff --git a/src/ec/kontron/it8516e/Makefile.inc b/src/ec/kontron/it8516e/Makefile.inc deleted file mode 100644 index 0d61b5916b..0000000000 --- a/src/ec/kontron/it8516e/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ifeq ($(CONFIG_EC_KONTRON_IT8516E),y) - -ramstage-y += ec.c - -endif diff --git a/src/ec/kontron/it8516e/Makefile.mk b/src/ec/kontron/it8516e/Makefile.mk new file mode 100644 index 0000000000..0d61b5916b --- /dev/null +++ b/src/ec/kontron/it8516e/Makefile.mk @@ -0,0 +1,6 @@ +## SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_EC_KONTRON_IT8516E),y) + +ramstage-y += ec.c + +endif diff --git a/src/ec/kontron/kempld/Makefile.inc b/src/ec/kontron/kempld/Makefile.inc deleted file mode 100644 index e4cdde4ca8..0000000000 --- a/src/ec/kontron/kempld/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -bootblock-$(CONFIG_EC_KONTRON_KEMPLD) += early_kempld.c -ramstage-$(CONFIG_EC_KONTRON_KEMPLD) += early_kempld.c -ramstage-$(CONFIG_EC_KONTRON_KEMPLD) += kempld.c -ramstage-$(CONFIG_EC_KONTRON_KEMPLD) += kempld_i2c.c -ramstage-$(CONFIG_EC_KONTRON_KEMPLD) += kempld_gpio.c diff --git a/src/ec/kontron/kempld/Makefile.mk b/src/ec/kontron/kempld/Makefile.mk new file mode 100644 index 0000000000..e4cdde4ca8 --- /dev/null +++ b/src/ec/kontron/kempld/Makefile.mk @@ -0,0 +1,6 @@ +## SPDX-License-Identifier: GPL-2.0-only +bootblock-$(CONFIG_EC_KONTRON_KEMPLD) += early_kempld.c +ramstage-$(CONFIG_EC_KONTRON_KEMPLD) += early_kempld.c +ramstage-$(CONFIG_EC_KONTRON_KEMPLD) += kempld.c +ramstage-$(CONFIG_EC_KONTRON_KEMPLD) += kempld_i2c.c +ramstage-$(CONFIG_EC_KONTRON_KEMPLD) += kempld_gpio.c diff --git a/src/ec/lenovo/h8/Makefile.inc b/src/ec/lenovo/h8/Makefile.inc deleted file mode 100644 index 3ac9941da0..0000000000 --- a/src/ec/lenovo/h8/Makefile.inc +++ /dev/null @@ -1,27 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ifeq ($(CONFIG_EC_LENOVO_H8),y) - -ramstage-y += sense.c -verstage-y += sense.c -romstage-y += sense.c -bootblock-y += sense.c -postcar-y += sense.c -smm-y += sense.c - -ramstage-$(CONFIG_VBOOT) += vboot.c -verstage-$(CONFIG_VBOOT) += vboot.c -romstage-$(CONFIG_VBOOT) += vboot.c -bootblock-$(CONFIG_VBOOT) += vboot.c -postcar-$(CONFIG_VBOOT) += vboot.c - -ifneq ($(filter y,$(CONFIG_H8_BEEP_ON_DEATH) $(CONFIG_H8_FLASH_LEDS_ON_DEATH)),) -romstage-y += panic.c -ramstage-y += panic.c -endif - -ramstage-y += h8.c -ramstage-y += bluetooth.c -ramstage-y += wwan.c -ramstage-$(CONFIG_HAVE_ACPI_TABLES) += ssdt.c - -endif diff --git a/src/ec/lenovo/h8/Makefile.mk b/src/ec/lenovo/h8/Makefile.mk new file mode 100644 index 0000000000..3ac9941da0 --- /dev/null +++ b/src/ec/lenovo/h8/Makefile.mk @@ -0,0 +1,27 @@ +## SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_EC_LENOVO_H8),y) + +ramstage-y += sense.c +verstage-y += sense.c +romstage-y += sense.c +bootblock-y += sense.c +postcar-y += sense.c +smm-y += sense.c + +ramstage-$(CONFIG_VBOOT) += vboot.c +verstage-$(CONFIG_VBOOT) += vboot.c +romstage-$(CONFIG_VBOOT) += vboot.c +bootblock-$(CONFIG_VBOOT) += vboot.c +postcar-$(CONFIG_VBOOT) += vboot.c + +ifneq ($(filter y,$(CONFIG_H8_BEEP_ON_DEATH) $(CONFIG_H8_FLASH_LEDS_ON_DEATH)),) +romstage-y += panic.c +ramstage-y += panic.c +endif + +ramstage-y += h8.c +ramstage-y += bluetooth.c +ramstage-y += wwan.c +ramstage-$(CONFIG_HAVE_ACPI_TABLES) += ssdt.c + +endif diff --git a/src/ec/lenovo/pmh7/Makefile.inc b/src/ec/lenovo/pmh7/Makefile.inc deleted file mode 100644 index 4f8c99f125..0000000000 --- a/src/ec/lenovo/pmh7/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ifeq ($(CONFIG_EC_LENOVO_PMH7),y) - -bootblock-y += pmh7.c -ramstage-y += pmh7.c -smm-y += pmh7.c -romstage-y += pmh7.c - -endif diff --git a/src/ec/lenovo/pmh7/Makefile.mk b/src/ec/lenovo/pmh7/Makefile.mk new file mode 100644 index 0000000000..4f8c99f125 --- /dev/null +++ b/src/ec/lenovo/pmh7/Makefile.mk @@ -0,0 +1,9 @@ +## SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_EC_LENOVO_PMH7),y) + +bootblock-y += pmh7.c +ramstage-y += pmh7.c +smm-y += pmh7.c +romstage-y += pmh7.c + +endif diff --git a/src/ec/purism/librem-ec/Makefile.inc b/src/ec/purism/librem-ec/Makefile.inc deleted file mode 100644 index 464371f272..0000000000 --- a/src/ec/purism/librem-ec/Makefile.inc +++ /dev/null @@ -1,8 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ifeq ($(CONFIG_EC_LIBREM_EC),y) - -all-y += ../../system76/ec/system76_ec.c -all-y += librem_ec.c -smm-$(CONFIG_DEBUG_SMI) += ../../system76/ec/system76_ec.c - -endif diff --git a/src/ec/purism/librem-ec/Makefile.mk b/src/ec/purism/librem-ec/Makefile.mk new file mode 100644 index 0000000000..464371f272 --- /dev/null +++ b/src/ec/purism/librem-ec/Makefile.mk @@ -0,0 +1,8 @@ +## SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_EC_LIBREM_EC),y) + +all-y += ../../system76/ec/system76_ec.c +all-y += librem_ec.c +smm-$(CONFIG_DEBUG_SMI) += ../../system76/ec/system76_ec.c + +endif diff --git a/src/ec/quanta/ene_kb3940q/Makefile.inc b/src/ec/quanta/ene_kb3940q/Makefile.inc deleted file mode 100644 index 8a6c86526b..0000000000 --- a/src/ec/quanta/ene_kb3940q/Makefile.inc +++ /dev/null @@ -1,8 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ifeq ($(CONFIG_EC_QUANTA_ENE_KB3940Q),y) - -ramstage-y += ec.c -smm-y += ec.c -smm-y += ../../../lib/delay.c - -endif diff --git a/src/ec/quanta/ene_kb3940q/Makefile.mk b/src/ec/quanta/ene_kb3940q/Makefile.mk new file mode 100644 index 0000000000..8a6c86526b --- /dev/null +++ b/src/ec/quanta/ene_kb3940q/Makefile.mk @@ -0,0 +1,8 @@ +## SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_EC_QUANTA_ENE_KB3940Q),y) + +ramstage-y += ec.c +smm-y += ec.c +smm-y += ../../../lib/delay.c + +endif diff --git a/src/ec/quanta/it8518/Makefile.inc b/src/ec/quanta/it8518/Makefile.inc deleted file mode 100644 index b05db0687a..0000000000 --- a/src/ec/quanta/it8518/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ifeq ($(CONFIG_EC_QUANTA_IT8518),y) - -romstage-y += ec.c -ramstage-y += ec.c -smm-y += ec.c -smm-y += ../../../lib/delay.c - -endif diff --git a/src/ec/quanta/it8518/Makefile.mk b/src/ec/quanta/it8518/Makefile.mk new file mode 100644 index 0000000000..b05db0687a --- /dev/null +++ b/src/ec/quanta/it8518/Makefile.mk @@ -0,0 +1,9 @@ +## SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_EC_QUANTA_IT8518),y) + +romstage-y += ec.c +ramstage-y += ec.c +smm-y += ec.c +smm-y += ../../../lib/delay.c + +endif diff --git a/src/ec/roda/it8518/Makefile.inc b/src/ec/roda/it8518/Makefile.inc deleted file mode 100644 index e5b483f7a6..0000000000 --- a/src/ec/roda/it8518/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-$(CONFIG_EC_RODA_IT8518) += ec.c diff --git a/src/ec/roda/it8518/Makefile.mk b/src/ec/roda/it8518/Makefile.mk new file mode 100644 index 0000000000..e5b483f7a6 --- /dev/null +++ b/src/ec/roda/it8518/Makefile.mk @@ -0,0 +1,3 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-$(CONFIG_EC_RODA_IT8518) += ec.c diff --git a/src/ec/smsc/mec1308/Makefile.inc b/src/ec/smsc/mec1308/Makefile.inc deleted file mode 100644 index 199742c6a0..0000000000 --- a/src/ec/smsc/mec1308/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ifeq ($(CONFIG_EC_SMSC_MEC1308),y) - -ramstage-y += ec.c -smm-y += ec.c - -endif diff --git a/src/ec/smsc/mec1308/Makefile.mk b/src/ec/smsc/mec1308/Makefile.mk new file mode 100644 index 0000000000..199742c6a0 --- /dev/null +++ b/src/ec/smsc/mec1308/Makefile.mk @@ -0,0 +1,7 @@ +## SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_EC_SMSC_MEC1308),y) + +ramstage-y += ec.c +smm-y += ec.c + +endif diff --git a/src/ec/starlabs/merlin/Makefile.inc b/src/ec/starlabs/merlin/Makefile.inc deleted file mode 100644 index 841b65959a..0000000000 --- a/src/ec/starlabs/merlin/Makefile.inc +++ /dev/null @@ -1,37 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ifeq ($(CONFIG_EC_STARLABS_ITE),y) - -PHONY+=add_ite_fw -INTERMEDIATE+=add_ite_fw - -EC_VARIANT_DIR := $(call strip_quotes, $(CONFIG_EC_VARIANT_DIR)) -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 -else -show_notices:: warn_no_ite_fw - -PHONY+=warn_no_ite_fw -warn_no_ite_fw: - printf "\n\t** WARNING **\n" - printf "coreboot has been built without the ITE EC Firmware.\n" - printf "Do not flash this image. Your laptop's power button\n" - printf "may not respond when you press it.\n\n" -endif -endif -endif - -ifeq ($(CONFIG_EC_STARLABS_NUVOTON),y) - -EC_VARIANT_DIR := $(call strip_quotes, $(CONFIG_EC_VARIANT_DIR)) -CPPFLAGS_common += -I$(src)/ec/starlabs/merlin/variants/$(EC_VARIANT_DIR) - -all-y += nuvoton.c - -endif diff --git a/src/ec/starlabs/merlin/Makefile.mk b/src/ec/starlabs/merlin/Makefile.mk new file mode 100644 index 0000000000..841b65959a --- /dev/null +++ b/src/ec/starlabs/merlin/Makefile.mk @@ -0,0 +1,37 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ifeq ($(CONFIG_EC_STARLABS_ITE),y) + +PHONY+=add_ite_fw +INTERMEDIATE+=add_ite_fw + +EC_VARIANT_DIR := $(call strip_quotes, $(CONFIG_EC_VARIANT_DIR)) +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 +else +show_notices:: warn_no_ite_fw + +PHONY+=warn_no_ite_fw +warn_no_ite_fw: + printf "\n\t** WARNING **\n" + printf "coreboot has been built without the ITE EC Firmware.\n" + printf "Do not flash this image. Your laptop's power button\n" + printf "may not respond when you press it.\n\n" +endif +endif +endif + +ifeq ($(CONFIG_EC_STARLABS_NUVOTON),y) + +EC_VARIANT_DIR := $(call strip_quotes, $(CONFIG_EC_VARIANT_DIR)) +CPPFLAGS_common += -I$(src)/ec/starlabs/merlin/variants/$(EC_VARIANT_DIR) + +all-y += nuvoton.c + +endif diff --git a/src/ec/system76/ec/Makefile.inc b/src/ec/system76/ec/Makefile.inc deleted file mode 100644 index 9808e297d6..0000000000 --- a/src/ec/system76/ec/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only -ifeq ($(CONFIG_EC_SYSTEM76_EC),y) - -all-y += system76_ec.c - -ramstage-y += smbios.c - -smm-$(CONFIG_DEBUG_SMI) += system76_ec.c - -endif diff --git a/src/ec/system76/ec/Makefile.mk b/src/ec/system76/ec/Makefile.mk new file mode 100644 index 0000000000..9808e297d6 --- /dev/null +++ b/src/ec/system76/ec/Makefile.mk @@ -0,0 +1,10 @@ +## SPDX-License-Identifier: GPL-2.0-only +ifeq ($(CONFIG_EC_SYSTEM76_EC),y) + +all-y += system76_ec.c + +ramstage-y += smbios.c + +smm-$(CONFIG_DEBUG_SMI) += system76_ec.c + +endif -- cgit v1.2.3