summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <gaumless@gmail.com>2015-07-09 20:50:51 -0600
committerMartin Roth <martinroth@google.com>2015-09-04 18:08:15 +0000
commitc6a177d50064a22215c8f682e1d16043d5470fa8 (patch)
tree2966a514e373a076f8d033e99d4139f2f2514a97
parent439356fabcacbbc3a3231f6e27b5298f8f5ad41f (diff)
downloadcoreboot-c6a177d50064a22215c8f682e1d16043d5470fa8.tar.xz
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 <gaumless@gmail.com> Reviewed-on: http://review.coreboot.org/10875 Tested-by: build bot (Jenkins) Reviewed-by: Alexander Couzens <lynxis@fe80.eu>
-rw-r--r--src/southbridge/intel/common/firmware/Kconfig13
-rw-r--r--src/southbridge/intel/common/firmware/Makefile.inc7
2 files changed, 20 insertions, 0 deletions
diff --git a/src/southbridge/intel/common/firmware/Kconfig b/src/southbridge/intel/common/firmware/Kconfig
index ba278c13ea..25efe40654 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 7a97e37529..6fa4d27828 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