Attention is currently required from: Ashish Kumar Mishra, Dinesh Gehlot, Eran Mitrani, Felix Singer, Jakub Czapiga, Jérémy Compostella, Kapil Porwal, Subrata Banik, Tarun.
Saurabh Mishra has posted comments on this change by Saurabh Mishra. ( https://review.coreboot.org/c/coreboot/+/83354?usp=email )
Change subject: soc/intel/ptl: Do initial Panther Lake SoC commit till bootblock
......................................................................
Patch Set 16:
(7 comments)
File src/soc/intel/pantherlake/include/soc/iomap.h:
https://review.coreboot.org/c/coreboot/+/83354/comment/ee65de6f_61b2fcf3?us… :
PS16, Line 10: */
> missing leading space.
Acknowledged
File src/soc/intel/pantherlake/include/soc/p2sb.h:
https://review.coreboot.org/c/coreboot/+/83354/comment/f8cb0437_b0f4cb54?us… :
PS16, Line 7: (1 << 7)
> `BIT(7)` ?
Acknowledged
File src/soc/intel/pantherlake/include/soc/pci_devs.h:
https://review.coreboot.org/c/coreboot/+/83354/comment/5a703496_021a7397?us… :
PS16, Line 61: xb
> 0x0b
Acknowledged
https://review.coreboot.org/c/coreboot/+/83354/comment/0c7c32c1_c626d761?us… :
PS16, Line 65: 0xc
> 0x0c
Acknowledged
https://review.coreboot.org/c/coreboot/+/83354/comment/811a66fb_fb8b28c3?us… :
PS16, Line 219: #endif //_SOC_PANTHERLAKE_PCI_DEVS_H_
> Shouldn't this be at the end of the file ?
Acknowledged
File src/soc/intel/pantherlake/include/soc/pcr_ids.h:
https://review.coreboot.org/c/coreboot/+/83354/comment/84b7efeb_489a8165?us… :
PS16, Line 8: #define PID_GPIOCOM0 0x59
> Where do these PID values come from ?
These are referenced from HAS doc.
File src/soc/intel/pantherlake/include/soc/pm.h:
https://review.coreboot.org/c/coreboot/+/83354/comment/bcb449c8_923189c4?us… :
PS16, Line 7: (1 << 15)
> Could we use the `BIT` macro instead ?
Hi Jeremey, we can do it, i feel it can be done in the refactoring phase.
--
To view, visit https://review.coreboot.org/c/coreboot/+/83354?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ibcfe71eec27cebf04f10ec343a73dd92f1272aca
Gerrit-Change-Number: 83354
Gerrit-PatchSet: 16
Gerrit-Owner: Saurabh Mishra <mishra.saurabh(a)intel.com>
Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com>
Gerrit-Reviewer: Eran Mitrani <mitrani(a)google.com>
Gerrit-Reviewer: Jakub Czapiga <czapiga(a)google.com>
Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: Tarun <tstuli(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Anil Kumar K <anil.kumar.k(a)intel.com>
Gerrit-CC: Ashish Kumar Mishra <ashish.k.mishra(a)intel.com>
Gerrit-CC: Balaji Manigandan <balaji.manigandan(a)intel.com>
Gerrit-CC: Bora Guvendik <bora.guvendik(a)intel.com>
Gerrit-CC: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-CC: Hannah Williams <hannah.williams(a)intel.com>
Gerrit-CC: Jérémy Compostella <jeremy.compostella(a)intel.com>
Gerrit-CC: Ravishankar Sarawadi <ravishankar.sarawadi(a)intel.com>
Gerrit-CC: Sanju Jose Thottan <sanjujose.thottan(a)intel.com>
Gerrit-CC: Saurabh Mishra <mishra.saurabh(a)intel.corp-partner.google.com>
Gerrit-CC: Vikrant L Jadeja <vikrant.l.jadeja(a)intel.com>
Gerrit-CC: Wonkyu Kim <wonkyu.kim(a)intel.com>
Gerrit-Attention: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Attention: Ashish Kumar Mishra <ashish.k.mishra(a)intel.com>
Gerrit-Attention: Eran Mitrani <mitrani(a)google.com>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Jakub Czapiga <czapiga(a)google.com>
Gerrit-Attention: Jérémy Compostella <jeremy.compostella(a)intel.com>
Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Attention: Dinesh Gehlot <digehlot(a)google.com>
Gerrit-Attention: Tarun <tstuli(a)gmail.com>
Gerrit-Comment-Date: Fri, 26 Jul 2024 04:37:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Jérémy Compostella <jeremy.compostella(a)intel.com>
Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/81024?usp=email )
Change subject: 3rdparty: Remove chromeec submodule
......................................................................
3rdparty: Remove chromeec submodule
The chromeec submodule is the largest submodule being pulled into the
coreboot tree, at over 400MB. The main branch also contains the majority
of these commits, so restricting it to a single branch still fetches
over 350MB.
Because there is only a single mainboard directory that enables the
build of the chromeec codebase by default, most people are fetching this
repo for no reason.
Based on this, we're going to change the way that the chromeec submodule
is used, fetching it the way we currently fetch external payloads. This
gives us 2 large advantages:
1) Only builds that actually need the chromeec repo will pull it down.
2) Each board that wants to build the chromeec codebase can use a
different commit, unlike submodules which all use the same "current"
commit.
Signed-off-by: Martin Roth <gaumless(a)gmail.com>
Change-Id: I357c4c9b506dd3817a308232446144ae889bc220
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81024
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier(a)gmail.com>
Reviewed-by: Julius Werner <jwerner(a)chromium.org>
Reviewed-by: Angel Pons <th3fanbus(a)gmail.com>
Reviewed-by: Elyes Haouas <ehaouas(a)noos.fr>
Reviewed-by: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
---
M .gitmodules
D 3rdparty/chromeec
2 files changed, 0 insertions(+), 4 deletions(-)
Approvals:
Julius Werner: Looks good to me, approved
Angel Pons: Looks good to me, but someone else must approve
Felix Singer: Looks good to me, approved
Matt DeVillier: Looks good to me, but someone else must approve
Elyes Haouas: Looks good to me, approved
build bot (Jenkins): Verified
diff --git a/.gitmodules b/.gitmodules
index f1fbe34..eec69fd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,6 @@
[submodule "arm-trusted-firmware"]
path = 3rdparty/arm-trusted-firmware
url = https://review.coreboot.org/arm-trusted-firmware.git
-[submodule "3rdparty/chromeec"]
- path = 3rdparty/chromeec
- url = https://review.coreboot.org/chrome-ec.git
[submodule "libhwbase"]
path = 3rdparty/libhwbase
url = https://review.coreboot.org/libhwbase.git
diff --git a/3rdparty/chromeec b/3rdparty/chromeec
deleted file mode 160000
index e486b38..0000000
--- a/3rdparty/chromeec
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e486b388a73f1e19f3142774d0b3ee166e8f41ff
--
To view, visit https://review.coreboot.org/c/coreboot/+/81024?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I357c4c9b506dd3817a308232446144ae889bc220
Gerrit-Change-Number: 81024
Gerrit-PatchSet: 9
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Elyes Haouas <ehaouas(a)noos.fr>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Caveh Jalali <caveh(a)chromium.org>
Attention is currently required from: Martin L Roth, Matt DeVillier.
Felix Singer has posted comments on this change by Martin L Roth. ( https://review.coreboot.org/c/coreboot/+/81024?usp=email )
Change subject: 3rdparty: Remove chromeec submodule
......................................................................
Patch Set 8: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/81024?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I357c4c9b506dd3817a308232446144ae889bc220
Gerrit-Change-Number: 81024
Gerrit-PatchSet: 8
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Elyes Haouas <ehaouas(a)noos.fr>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Caveh Jalali <caveh(a)chromium.org>
Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Comment-Date: Fri, 26 Jul 2024 04:36:46 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: Eric Lai, Felix Singer, Matt DeVillier, Sean Rhodes.
Elyes Haouas has posted comments on this change by Felix Singer. ( https://review.coreboot.org/c/coreboot/+/83456?usp=email )
Change subject: mb/starlabs/starbook/cml: Drop superfluous devices from devicetree
......................................................................
Patch Set 6: Code-Review+1
--
To view, visit https://review.coreboot.org/c/coreboot/+/83456?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I92765b404508901c7e84fad0bca30489cf69abac
Gerrit-Change-Number: 83456
Gerrit-PatchSet: 6
Gerrit-Owner: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: Elyes Haouas <ehaouas(a)noos.fr>
Gerrit-Reviewer: Eric Lai <ericllai(a)google.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Attention: Eric Lai <ericllai(a)google.com>
Gerrit-Attention: Sean Rhodes <sean(a)starlabs.systems>
Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Comment-Date: Fri, 26 Jul 2024 04:22:46 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: Martin L Roth, Matt DeVillier.
Elyes Haouas has posted comments on this change by Martin L Roth. ( https://review.coreboot.org/c/coreboot/+/81024?usp=email )
Change subject: 3rdparty: Remove chromeec submodule
......................................................................
Patch Set 8: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/81024?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I357c4c9b506dd3817a308232446144ae889bc220
Gerrit-Change-Number: 81024
Gerrit-PatchSet: 8
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Elyes Haouas <ehaouas(a)noos.fr>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Caveh Jalali <caveh(a)chromium.org>
Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Comment-Date: Fri, 26 Jul 2024 04:18:56 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83639?usp=email )
Change subject: ec/google/chromeec: Drop 'choice' selections for EC and PD firmware
......................................................................
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(a)gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83639
Reviewed-by: Julius Werner <jwerner(a)chromium.org>
Reviewed-by: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
---
M src/ec/google/chromeec/Kconfig
M src/ec/google/chromeec/Makefile.mk
2 files changed, 8 insertions(+), 40 deletions(-)
Approvals:
Felix Singer: Looks good to me, approved
build bot (Jenkins): Verified
Julius Werner: Looks good to me, approved
diff --git a/src/ec/google/chromeec/Kconfig b/src/ec/google/chromeec/Kconfig
index e8a5d58..7a8777f 100644
--- a/src/ec/google/chromeec/Kconfig
+++ b/src/ec/google/chromeec/Kconfig
@@ -110,22 +110,10 @@
Enable support for the real-time clock on the ChromeOS EC. This
uses the EC_CMD_RTC_GET_VALUE command to read the current time.
-choice
- prompt "Chrome EC firmware source"
- default EC_GOOGLE_CHROMEEC_FIRMWARE_NONE
-
- config EC_GOOGLE_CHROMEEC_FIRMWARE_NONE
- bool "No EC firmware is included"
+config EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL
+ bool "Include an external EC firmware binary"
help
- No EC firmware is included in the image.
-
- config EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL
- bool "External EC firmware is included"
- help
- Include EC firmware binary in the image from an external source.
- It is expected to be built externally.
-
-endchoice
+ Include a precompiled EC firmware binary in the image.
config EC_GOOGLE_CHROMEEC_FIRMWARE_FILE
string "Chrome EC firmware path and filename"
@@ -133,23 +121,11 @@
help
The path and filename of the EC firmware file to use.
-choice
- prompt "Chrome EC firmware source for PD"
+config EC_GOOGLE_CHROMEEC_PD_FIRMWARE_EXTERNAL
+ bool "Include an external PD firmware binary"
depends on EC_GOOGLE_CHROMEEC_PD
- default EC_GOOGLE_CHROMEEC_PD_FIRMWARE_NONE
-
- config EC_GOOGLE_CHROMEEC_PD_FIRMWARE_NONE
- bool "No PD firmware is included"
help
- No PD firmware is included in the image.
-
- config EC_GOOGLE_CHROMEEC_PD_FIRMWARE_EXTERNAL
- bool "External PD firmware is included"
- help
- Include PD firmware binary in the image from an external source.
- It is expected to be built externally.
-
-endchoice
+ Include a precompiled PD firmware binary in the image.
config EC_GOOGLE_CHROMEEC_PD_FIRMWARE_FILE
string "Chrome EC firmware path and filename for PD"
diff --git a/src/ec/google/chromeec/Makefile.mk b/src/ec/google/chromeec/Makefile.mk
index a8d2960..6465c2c 100644
--- a/src/ec/google/chromeec/Makefile.mk
+++ b/src/ec/google/chromeec/Makefile.mk
@@ -57,7 +57,7 @@
# 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-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-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 @@
endif
endif
-
-endif
--
To view, visit https://review.coreboot.org/c/coreboot/+/83639?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ie37ff3a188b414fd099fbb344858bca4df419086
Gerrit-Change-Number: 83639
Gerrit-PatchSet: 4
Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Caveh Jalali <caveh(a)chromium.org>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: Forest Mittelberg <bmbm(a)google.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83638?usp=email )
Change subject: ec/google/chromeec: Drop ability to build Chrome-EC, PD components
......................................................................
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(a)gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83638
Reviewed-by: Julius Werner <jwerner(a)chromium.org>
Reviewed-by: Caveh Jalali <caveh(a)chromium.org>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
---
M src/ec/google/chromeec/Kconfig
M src/ec/google/chromeec/Makefile.mk
M src/mainboard/google/foster/Kconfig
M src/mainboard/google/rambi/Kconfig
4 files changed, 2 insertions(+), 65 deletions(-)
Approvals:
Felix Singer: Looks good to me, approved
build bot (Jenkins): Verified
Julius Werner: Looks good to me, approved
Caveh Jalali: Looks good to me, but someone else must approve
diff --git a/src/ec/google/chromeec/Kconfig b/src/ec/google/chromeec/Kconfig
index 19790d1..e8a5d58 100644
--- a/src/ec/google/chromeec/Kconfig
+++ b/src/ec/google/chromeec/Kconfig
@@ -104,23 +104,6 @@
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 @@
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 @@
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 @@
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 @@
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 1cf88f2..a8d2960 100644
--- a/src/ec/google/chromeec/Makefile.mk
+++ b/src/ec/google/chromeec/Makefile.mk
@@ -74,19 +74,6 @@
$(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 @@
$(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
diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig
index 6a2d28e..cef17b1 100644
--- a/src/mainboard/google/foster/Kconfig
+++ b/src/mainboard/google/foster/Kconfig
@@ -61,10 +61,6 @@
hex
default 0x20
-#config EC_GOOGLE_CHROMEEC_BOARDNAME
-# string
-# default "nyan"
-
config VBOOT_FWID_MODEL
string
default "Nvidia_Foster"
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 600d989..65339e0 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -143,10 +143,6 @@
config OVERRIDE_DEVICETREE
default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
-config EC_GOOGLE_CHROMEEC_BOARDNAME
- string
- default ""
-
config MAINBOARD_SMBIOS_MANUFACTURER
string
default "GOOGLE"
--
To view, visit https://review.coreboot.org/c/coreboot/+/83638?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ibf6bd43e755cf5b4d2aa8a42f38dc52e7023e9b3
Gerrit-Change-Number: 83638
Gerrit-PatchSet: 2
Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Caveh Jalali <caveh(a)chromium.org>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: Forest Mittelberg <bmbm(a)google.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>