sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ec/google/chromeec: Drop ability to build Chrome-EC, PD components

Browse Source 
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>
This commit is contained in:
Matt DeVillier
2024-07-24 15:36:14 -05:00
committed by Felix Singer
parent 331cb328c2
commit a391ae18a8
4 changed files with 2 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/ec/google/chromeec/Kconfig
View File

@@ -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

26
src/ec/google/chromeec/Makefile.mk
View File

@@ -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

4
src/mainboard/google/foster/Kconfig
View File

@@ -61,10 +61,6 @@ config DRIVER_TPM_I2C_ADDR
hex
default 0x20
#config EC_GOOGLE_CHROMEEC_BOARDNAME
# string
# default "nyan"
config VBOOT_FWID_MODEL
string
default "Nvidia_Foster"

4
src/mainboard/google/rambi/Kconfig
View File

@@ -143,10 +143,6 @@ config MAINBOARD_PART_NUMBER
config OVERRIDE_DEVICETREE
default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
config EC_GOOGLE_CHROMEEC_BOARDNAME
string
default ""
config MAINBOARD_SMBIOS_MANUFACTURER
string
default "GOOGLE"