diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2024-07-24 15:46:49 -0500 |
|---|---|---|
| committer | Felix Singer <service+coreboot-gerrit@felixsinger.de> | 2024-07-26 02:58:41 +0000 |
| commit | 6d6ec575b72fe4507825210fb2258416c784755f (patch) | |
| tree | 31db7a87aeba8a60a9cdf5e850a85074953a4e6a /src/ec/google/chromeec/Makefile.mk | |
| parent | a391ae18a8ddb3dded031a2cca8210739d3ce1f8 (diff) | |
ec/google/chromeec: Drop 'choice' selections for EC and PD firmware
Since the EC and PD firmware sources are now limited to two options -
'none' and 'external' - drop the choice selection and make the
EC and PD external options independent.
TEST=build google/lulu with external EC binary using existing defconfig
Change-Id: Ie37ff3a188b414fd099fbb344858bca4df419086
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83639
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/ec/google/chromeec/Makefile.mk')
| -rw-r--r-- | src/ec/google/chromeec/Makefile.mk | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/ec/google/chromeec/Makefile.mk b/src/ec/google/chromeec/Makefile.mk index a8d2960fe1..6465c2cd6d 100644 --- a/src/ec/google/chromeec/Makefile.mk +++ b/src/ec/google/chromeec/Makefile.mk @@ -57,7 +57,7 @@ CHROMEEC_SOURCE ?= $(top)/3rdparty/chromeec # 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) +ifeq ($(CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL),y) cbfs-files-y += ecrw ecrw-file := $(obj)/mainboard/$(MAINBOARDDIR)/ecrw @@ -69,21 +69,17 @@ 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) $@ -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) +ifeq ($(CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_EXTERNAL),y) cbfs-files-y += pdrw pdrw-file := $(obj)/mainboard/$(MAINBOARDDIR)/pdrw @@ -95,12 +91,10 @@ 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) $@ -endif $(obj)/mainboard/$(MAINBOARDDIR)/pdrw.hash: $(obj)/mainboard/$(MAINBOARDDIR)/pdrw openssl dgst -sha256 -binary $< > $@ @@ -108,5 +102,3 @@ $(obj)/mainboard/$(MAINBOARDDIR)/pdrw.hash: $(obj)/mainboard/$(MAINBOARDDIR)/pdr endif endif - -endif |