From c6a177d50064a22215c8f682e1d16043d5470fa8 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 9 Jul 2015 20:50:51 -0600 Subject: [PATCH] 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 Reviewed-on: http://review.coreboot.org/10875 Tested-by: build bot (Jenkins) Reviewed-by: Alexander Couzens --- 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 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