summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIru Cai <mytbk920423@gmail.com>2020-09-16 21:10:58 +0800
committerPatrick Georgi <pgeorgi@google.com>2020-09-28 09:26:54 +0000
commit27dc761d081b1430ce65acb50b86588a05d7212c (patch)
tree840944592a2f9c9c99260f52d71269be73f64650 /src
parent90381231ea208261edd2f21f511210559eedd8e5 (diff)
downloadcoreboot-27dc761d081b1430ce65acb50b86588a05d7212c.tar.xz
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 <mytbk920423@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/45575 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src')
-rw-r--r--src/ec/hp/kbc1126/Kconfig7
-rw-r--r--src/ec/hp/kbc1126/Makefile.inc10
2 files changed, 11 insertions, 6 deletions
diff --git a/src/ec/hp/kbc1126/Kconfig b/src/ec/hp/kbc1126/Kconfig
index 924501fbeb..fa2414adbc 100644
--- a/src/ec/hp/kbc1126/Kconfig
+++ b/src/ec/hp/kbc1126/Kconfig
@@ -5,7 +5,12 @@ config EC_HP_KBC1126
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 54e8b2afc3..43e5d3fb0b 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 @@ ifeq ($(CONFIG_KBC1126_FIRMWARE),)
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