[coreboot-gerrit] New patch to review for coreboot: e579588 intel/bd82x6x: Add option to include ethernet firmware

[Patrick Georgi (patrick@georgi-clan.de)]

Patrick Georgi (patrick at georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3388

-gerrit

commit e5795881bc48900fb4b12a92e220edca94598955
Author: Nico Huber <nico.huber at secunet.com>
Date:   Tue May 14 15:14:08 2013 +0200

    intel/bd82x6x: Add option to include ethernet firmware
    
    Change-Id: Idf804ed29a67bad732df19e6981f74c8d0c354b5
    Signed-off-by: Nico Huber <nico.huber at secunet.com>
---
 src/southbridge/intel/bd82x6x/Kconfig      | 13 +++++++++++++
 src/southbridge/intel/bd82x6x/Makefile.inc |  7 +++++++
 2 files changed, 20 insertions(+)

diff --git a/src/southbridge/intel/bd82x6x/Kconfig b/src/southbridge/intel/bd82x6x/Kconfig
index 5dd492c..79c812e 100644
--- a/src/southbridge/intel/bd82x6x/Kconfig
+++ b/src/southbridge/intel/bd82x6x/Kconfig
@@ -59,6 +59,19 @@ config HPET_MIN_TICKS
 	hex
 	default 0x80
 
+config HAVE_GBE_BIN
+	bool "Add gigabit ethernet firmware"
+	default n
+	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/mainboard/$(MAINBOARDDIR)/gbe.bin"
+
 config LOCK_MANAGEMENT_ENGINE
 	bool "Lock Management Engine section"
 	default n
diff --git a/src/southbridge/intel/bd82x6x/Makefile.inc b/src/southbridge/intel/bd82x6x/Makefile.inc
index bc3ff4b..f833ba1 100644
--- a/src/southbridge/intel/bd82x6x/Makefile.inc
+++ b/src/southbridge/intel/bd82x6x/Makefile.inc
@@ -63,6 +63,13 @@ bd82x6x_add_me: $(obj)/coreboot.pre $(IFDTOOL)
 		-i ME:3rdparty/mainboard/$(MAINBOARDDIR)/me.bin \
 		$(obj)/coreboot.pre
 	mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
+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