Change in coreboot[master]: sb/intel/common: Add common EC fw support

[Andrey Petrov (Code Review)]

Andrey Petrov has submitted this change and it was merged. ( https://review.coreboot.org/19719 )

Change subject: sb/intel/common: Add common EC fw support
......................................................................

sb/intel/common: Add common EC fw support

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é 
---
M src/southbridge/intel/common/firmware/Kconfig
M src/southbridge/intel/common/firmware/Makefile.inc
2 files changed, 23 insertions(+), 0 deletions(-)

Approvals:
  Aaron Durbin: Looks good to me, approved
  Philippe Mathieu-Daudé: Looks good to me, but someone else must approve
  Sumeet R Pawnikar: Looks good to me, approved
  build bot (Jenkins): Verified

diff --git a/src/southbridge/intel/common/firmware/Kconfig b/src/southbridge/intel/common/firmware/Kconfig
index f4be93c..ed7dd29 100644
--- a/src/southbridge/intel/common/firmware/Kconfig
+++ b/src/southbridge/intel/common/firmware/Kconfig
@@ -115,6 +115,21 @@
    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 eb4c07e..7cdbdec 100644
--- a/src/southbridge/intel/common/firmware/Makefile.inc
+++ b/src/southbridge/intel/common/firmware/Makefile.inc
@@ -74,6 +74,14 @@
    	$(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 \