summaryrefslogtreecommitdiff
path: root/src/ec/google
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2024-07-24 15:36:14 -0500
committerFelix Singer <service+coreboot-gerrit@felixsinger.de>2024-07-26 02:58:36 +0000
commita391ae18a8ddb3dded031a2cca8210739d3ce1f8 (patch)
treec76374b67955bfdf444b66917b4d82e29f9aab5f /src/ec/google
parent331cb328c29dee5cb4053059fd21f134176ca96f (diff)
ec/google/chromeec: Drop ability to build Chrome-EC, PD components
In preparation for dropping the Chrome-EC submodule, remove the ability for Chrome-EC and PD components to be built as part of coreboot. These components have not been used or buildable for many years. Change-Id: Ibf6bd43e755cf5b4d2aa8a42f38dc52e7023e9b3 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/83638 Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Caveh Jalali <caveh@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Diffstat (limited to 'src/ec/google')
-rw-r--r--src/ec/google/chromeec/Kconfig33
-rw-r--r--src/ec/google/chromeec/Makefile.mk26
2 files changed, 2 insertions, 57 deletions
diff --git a/src/ec/google/chromeec/Kconfig b/src/ec/google/chromeec/Kconfig
index 19790d12fb..e8a5d58ab0 100644
--- a/src/ec/google/chromeec/Kconfig
+++ b/src/ec/google/chromeec/Kconfig
@@ -104,23 +104,6 @@ config EC_GOOGLE_CHROMEEC_SKUID
help
Provides common routine for reporting the skuid to ChromeOS.
-config EC_GOOGLE_CHROMEEC_BOARDNAME
- string "Chrome EC board name for EC"
- default ""
- help
- The board name used in the Chrome EC code base to build
- the EC firmware. If set, the coreboot build with also
- build the EC firmware and add it to the image.
-
-config EC_GOOGLE_CHROMEEC_PD_BOARDNAME
- depends on EC_GOOGLE_CHROMEEC_PD
- string "Chrome EC board name for PD"
- default ""
- help
- The board name used in the Chrome EC code base to build
- the PD firmware. If set, the coreboot build with also
- build the EC firmware and add it to the image.
-
config EC_GOOGLE_CHROMEEC_RTC
bool "Enable ChromeOS EC RTC"
help
@@ -129,13 +112,12 @@ config EC_GOOGLE_CHROMEEC_RTC
choice
prompt "Chrome EC firmware source"
- default EC_GOOGLE_CHROMEEC_FIRMWARE_BUILTIN if EC_GOOGLE_CHROMEEC_BOARDNAME != ""
default EC_GOOGLE_CHROMEEC_FIRMWARE_NONE
config EC_GOOGLE_CHROMEEC_FIRMWARE_NONE
bool "No EC firmware is included"
help
- Disable building and including any EC firmware in the image.
+ No EC firmware is included in the image.
config EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL
bool "External EC firmware is included"
@@ -143,11 +125,6 @@ choice
Include EC firmware binary in the image from an external source.
It is expected to be built externally.
- config EC_GOOGLE_CHROMEEC_FIRMWARE_BUILTIN
- bool "Builtin EC firmware is included"
- help
- Build and include EC firmware binary in the image.
-
endchoice
config EC_GOOGLE_CHROMEEC_FIRMWARE_FILE
@@ -159,13 +136,12 @@ config EC_GOOGLE_CHROMEEC_FIRMWARE_FILE
choice
prompt "Chrome EC firmware source for PD"
depends on EC_GOOGLE_CHROMEEC_PD
- default EC_GOOGLE_CHROMEEC_PD_FIRMWARE_BUILTIN if EC_GOOGLE_CHROMEEC_PD_BOARDNAME != ""
default EC_GOOGLE_CHROMEEC_PD_FIRMWARE_NONE
config EC_GOOGLE_CHROMEEC_PD_FIRMWARE_NONE
bool "No PD firmware is included"
help
- Disable building and including any PD firmware in the image.
+ No PD firmware is included in the image.
config EC_GOOGLE_CHROMEEC_PD_FIRMWARE_EXTERNAL
bool "External PD firmware is included"
@@ -173,11 +149,6 @@ choice
Include PD firmware binary in the image from an external source.
It is expected to be built externally.
- config EC_GOOGLE_CHROMEEC_PD_FIRMWARE_BUILTIN
- bool "Builtin PD firmware is included"
- help
- Build and include PD firmware binary in the image.
-
endchoice
config EC_GOOGLE_CHROMEEC_PD_FIRMWARE_FILE
diff --git a/src/ec/google/chromeec/Makefile.mk b/src/ec/google/chromeec/Makefile.mk
index 1cf88f260b..a8d2960fe1 100644
--- a/src/ec/google/chromeec/Makefile.mk
+++ b/src/ec/google/chromeec/Makefile.mk
@@ -74,19 +74,6 @@ CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_FILE := $(call strip_quotes,$(CONFIG_EC_GOOGL
$(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
@@ -113,19 +100,6 @@ CONFIG_EC_GOOGLE_CHROMEEC_PD_FIRMWARE_FILE := $(call strip_quotes,$(CONFIG_EC_GO
$(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