Patch set updated for coreboot: intel/common/firmware: Add common GBE rom support

[Martin Roth]

Martin Roth ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10875

-gerrit

commit 1242f98c59e67983b84dfb060105be88940ae6b7
Author: Martin Roth 
Date:   Thu Jul 9 20:50:51 2015 -0600

intel/common/firmware: Add common GBE rom support

Add support to the Intel common firmware Kconfig and Makefile.inc to
    allow the Gigabit Ethernet (GBE) blob to be added to the final
    binary.

Change-Id: Id5fab3061874dad759750b67d3339eb8c99a62d6
    Signed-off-by: Martin Roth 
---
 src/southbridge/intel/common/firmware/Kconfig      | 13 +++++++++++++
 src/southbridge/intel/common/firmware/Makefile.inc |  7 +++++++
 2 files changed, 20 insertions(+)

diff --git a/src/southbridge/intel/common/firmware/Kconfig b/src/southbridge/intel/common/firmware/Kconfig
index ba278c1..25efe40 100644
--- a/src/southbridge/intel/common/firmware/Kconfig
+++ b/src/southbridge/intel/common/firmware/Kconfig
@@ -56,6 +56,19 @@ config ME_BIN_PATH
    default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/me.bin"
    depends on HAVE_ME_BIN

+config HAVE_GBE_BIN
+	bool "Add gigabit ethernet firmware"
+	depends on HAVE_IFD_BIN
+	help
+	  The integrated gigabit ethernet controller needs a firmware file.
+	  Select this if you are going to use the PCH integrated controller
+	  and have the firmware.
+
+config GBE_BIN_PATH
+	string "Path to gigabit ethernet firmware"
+	depends on HAVE_GBE_BIN
+	default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/gbe.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 7a97e37..6fa4d27 100644
--- a/src/southbridge/intel/common/firmware/Makefile.inc
+++ b/src/southbridge/intel/common/firmware/Makefile.inc
@@ -58,6 +58,13 @@ ifeq ($(CONFIG_HAVE_ME_BIN),y)
    	$(obj)/coreboot.pre
    mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
 endif
+ifeq ($(CONFIG_HAVE_GBE_BIN),y)
+	printf "    IFDTOOL    gbe.bin -> coreboot.pre\n"
+	$(objutil)/ifdtool/ifdtool \
+		-i GbE:$(CONFIG_GBE_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 -l $(obj)/coreboot.pre