[coreboot-gerrit] New patch to review for coreboot: 73f9008 sandybridge: Make inclusion of me.bin optional

[Nico Huber (nico.huber@secunet.com)]

Nico Huber (nico.huber at secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3522

-gerrit

commit 73f9008fdfa5ba7d15cfb10326af55e28592614d
Author: Nico Huber <nico.huber at secunet.com>
Date:   Wed Jun 19 15:57:34 2013 +0200

    sandybridge: Make inclusion of me.bin optional
    
    Current build configuration always wants to include an Intel Management
    Engine firmware (me.bin) on Sandy Bridge systems. However, we can have
    a working coreboot without it, as long as the factory delivered ME
    firmware is kept untouched in the flash ROM. So let the user decide if
    a ME firmware will be included in the build.
    
    Change-Id: I9a1cc29d4940ba22355eb9e653606e436f07e04c
    Signed-off-by: Nico Huber <nico.huber at secunet.com>
---
 src/southbridge/intel/bd82x6x/Kconfig      | 12 ++++++++++++
 src/southbridge/intel/bd82x6x/Makefile.inc |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/src/southbridge/intel/bd82x6x/Kconfig b/src/southbridge/intel/bd82x6x/Kconfig
index 08a60f9..1d544de 100644
--- a/src/southbridge/intel/bd82x6x/Kconfig
+++ b/src/southbridge/intel/bd82x6x/Kconfig
@@ -72,8 +72,20 @@ config GBE_BIN_PATH
 	depends on HAVE_GBE_BIN
 	default "3rdparty/mainboard/$(MAINBOARDDIR)/gbe.bin"
 
+config HAVE_ME_BIN
+	bool "Add Intel Management Engine firmware"
+	default y
+	help
+	  The Intel processor in the selected system requires a special firmware
+	  for an integrated controller called Management Engine (ME). The ME
+	  firmware might be provided in coreboot's 3rdparty repository. If
+	  not and if you don't have the firmware elsewhere, you can still
+	  build coreboot without it. In this case however, you'll have to make
+	  sure that you don't overwrite your ME firmware on your flash ROM.
+
 config ME_BIN_PATH
 	string "Path to management engine firmware"
+	depends on HAVE_ME_BIN
 	default "3rdparty/mainboard/$(MAINBOARDDIR)/me.bin"
 
 config IFD_BIN_PATH
diff --git a/src/southbridge/intel/bd82x6x/Makefile.inc b/src/southbridge/intel/bd82x6x/Makefile.inc
index e277450..73948d2 100644
--- a/src/southbridge/intel/bd82x6x/Makefile.inc
+++ b/src/southbridge/intel/bd82x6x/Makefile.inc
@@ -56,11 +56,13 @@ bd82x6x_add_me: $(obj)/coreboot.pre $(IFDTOOL)
 	printf "    DD         Adding Intel Firmware Descriptor\n"
 	dd if=$(CONFIG_IFD_BIN_PATH) \
 		of=$(obj)/coreboot.pre conv=notrunc >/dev/null 2>&1
+ifeq ($(CONFIG_HAVE_ME_BIN),y)
 	printf "    IFDTOOL    me.bin -> coreboot.pre\n"
 	$(objutil)/ifdtool/ifdtool \
 		-i ME:$(CONFIG_ME_BIN_PATH) \
 		$(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 \