From 0fb6568444328ec62e9585d827c77fd8ecc66cd3 Mon Sep 17 00:00:00 2001 From: Lijian Zhao Date: Tue, 16 May 2017 12:11:45 -0700 Subject: sb/intel/common: Add common EC fw support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add support to the Intel common firmware Kconfig and Makefile.inc to allow the embedded controller (EC) blob to be added to the final binary through ifdtool. TEST=Add ec.bin and enable in config, build is successful. Change-Id: Ib14732b4d263dde4770bf26b055c005de2540338 Signed-off-by: Lijian Zhao Reviewed-on: https://review.coreboot.org/19719 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Sumeet R Pawnikar Reviewed-by: Philippe Mathieu-Daudé --- src/southbridge/intel/common/firmware/Kconfig | 15 +++++++++++++++ src/southbridge/intel/common/firmware/Makefile.inc | 8 ++++++++ 2 files changed, 23 insertions(+) (limited to 'src/southbridge/intel') diff --git a/src/southbridge/intel/common/firmware/Kconfig b/src/southbridge/intel/common/firmware/Kconfig index f4be93cc07..ed7dd29507 100644 --- a/src/southbridge/intel/common/firmware/Kconfig +++ b/src/southbridge/intel/common/firmware/Kconfig @@ -115,6 +115,21 @@ config GBE_BIN_PATH depends on HAVE_GBE_BIN default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/gbe.bin" +config HAVE_EC_BIN + bool "Add EC firmware" + depends on HAVE_IFD_BIN + help + The embedded controller needs a firmware file. + + Select this if you are going to use the PCH integrated controller + and have the EC firmware. EC firmware will be added to final image + through ifdtool. + +config EC_BIN_PATH + string "Path to EC firmware" + depends on HAVE_EC_BIN + default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/ec.bin" + ##### Fake IFD ##### config BUILD_WITH_FAKE_IFD diff --git a/src/southbridge/intel/common/firmware/Makefile.inc b/src/southbridge/intel/common/firmware/Makefile.inc index eb4c07e91d..7cdbdec84a 100644 --- a/src/southbridge/intel/common/firmware/Makefile.inc +++ b/src/southbridge/intel/common/firmware/Makefile.inc @@ -74,6 +74,14 @@ ifeq ($(CONFIG_HAVE_GBE_BIN),y) $(obj)/coreboot.pre mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre endif +ifeq ($(CONFIG_HAVE_EC_BIN),y) + printf " IFDTOOL ec.bin -> coreboot.pre\n" + $(objutil)/ifdtool/ifdtool \ + $(IFDTOOL_USE_CHIPSET) \ + -i EC:$(CONFIG_EC_BIN_PATH) \ + $(obj)/coreboot.pre + mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre +endif ifeq ($(CONFIG_LOCK_MANAGEMENT_ENGINE),y) printf " IFDTOOL Locking Management Engine\n" $(objutil)/ifdtool/ifdtool \ -- cgit v1.2.3