summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIru Cai <mytbk920423@gmail.com>2020-09-16 21:10:58 +0800
committerIru Cai <mytbk920423@gmail.com>2020-09-17 00:12:32 +0800
commitbb2c2a97523528ce2132a6a70918e3d852c87bff (patch)
treef1aba874795e0e9e44df398dcc32f4dc01806be6
parente5aa5ae1ba5bc20af7d4db6e2af3ea9c96900c09 (diff)
downloadcoreboot-bb2c2a97523528ce2132a6a70918e3d852c87bff.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. Building coreboot for EliteBook Folio 9480m will not have a warning on not inserting the EC firmware after this change. The build system still inserts the EC firmware for EliteBook 2560p, and gives a warning when not choosing to insert the EC firmware. Change-Id: I3be83a13d138d3623064ef2803f3e3a340207ead Signed-off-by: Iru Cai <mytbk920423@gmail.com>
-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