[coreboot-gerrit] Change in coreboot[master]: ec/hp/kbc1126: Support not putting EC firmware in CBFS

[Iru Cai (vimacs) (Code Review)]

Hello Iru Cai,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/45575

to review the following change.

Change subject: ec/hp/kbc1126: Support not putting EC firmware in CBFS
......................................................................

ec/hp/kbc1126: Support not putting EC firmware in CBFS

For mainboards using the HP KBC1126 EC interface, but with a different
EC implementation, we don't put the EC firmware in the CBFS image. Add
a Kconfig option to prevent the build system warning on not inserting
the EC firmware.

After this change, building coreboot for EliteBook Folio 9480m will
not have a warning on not inserting the EC firmware.

The build system still builds a working coreboot image for EliteBook
2560p, and gives a warning if not choosing to insert the EC firmware.

Change-Id: I3be83a13d138d3623064ef2803f3e3a340207ead
Signed-off-by: Iru Cai 
---
M src/ec/hp/kbc1126/Kconfig
M src/ec/hp/kbc1126/Makefile.inc
2 files changed, 11 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/45575/1

diff --git a/src/ec/hp/kbc1126/Kconfig b/src/ec/hp/kbc1126/Kconfig
index 924501f..fa2414a 100644
--- a/src/ec/hp/kbc1126/Kconfig
+++ b/src/ec/hp/kbc1126/Kconfig
@@ -5,7 +5,12 @@
    help
      Interface to SMSC KBC1126 embedded controller in HP laptops.

-if EC_HP_KBC1126
+config EC_HP_KBC1126_ECFW_IN_CBFS
+	bool
+	depends on EC_HP_KBC1126
+	default y
+
+if EC_HP_KBC1126_ECFW_IN_CBFS

comment "Please select the following otherwise your laptop cannot be powered on."

diff --git a/src/ec/hp/kbc1126/Makefile.inc b/src/ec/hp/kbc1126/Makefile.inc
index 54e8b2a..43e5d3f 100644
--- a/src/ec/hp/kbc1126/Makefile.inc
+++ b/src/ec/hp/kbc1126/Makefile.inc
@@ -1,6 +1,6 @@
 ## SPDX-License-Identifier: GPL-2.0-only

-ifeq ($(CONFIG_EC_HP_KBC1126),y)
+ifeq ($(CONFIG_EC_HP_KBC1126_ECFW_IN_CBFS),y)
 KBC1126_EC_INSERT:=$(top)/util/kbc1126/kbc1126_ec_insert
 INTERMEDIATE+=kbc1126_ec_insert

@@ -39,8 +39,8 @@
    printf "You can read util/kbc1126/README.md for details.\n\n"
 endif

-ramstage-y += ec.c
-bootblock-y += early_init.c
-romstage-y += early_init.c
-
 endif
+
+ramstage-$(CONFIG_EC_HP_KBC1126) += ec.c
+bootblock-$(CONFIG_EC_HP_KBC1126) += early_init.c
+romstage-$(CONFIG_EC_HP_KBC1126) += early_init.c