summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@secunet.com>2013-06-13 15:07:02 +0200
committerPatrick Georgi <patrick@georgi-clan.de>2013-06-17 19:16:52 +0200
commit3cc151ede0677776f891c959568b92a79b9ecd9a (patch)
tree6bd84c00e0917dfb9b37733706ae3b08ea4510d6 /src
parent9cb0941cb2f4ceb77b470c4de617ca915896d9f3 (diff)
downloadcoreboot-3cc151ede0677776f891c959568b92a79b9ecd9a.tar.xz
Make intel blob locations configurable
They were hard-coded to be copied from 3rdparty/ which isn't always the right choice. Since the defaults stay the same, this should be compatible. Change-Id: If2173bef86ad1fcf2335e13472ea8ca41eb41f3d Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com> Reviewed-on: http://review.coreboot.org/3453 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Diffstat (limited to 'src')
-rw-r--r--src/southbridge/intel/bd82x6x/Kconfig8
-rw-r--r--src/southbridge/intel/bd82x6x/Makefile.inc4
-rw-r--r--src/southbridge/intel/lynxpoint/Kconfig8
-rw-r--r--src/southbridge/intel/lynxpoint/Makefile.inc4
4 files changed, 20 insertions, 4 deletions
diff --git a/src/southbridge/intel/bd82x6x/Kconfig b/src/southbridge/intel/bd82x6x/Kconfig
index 79c812eaa9..08a60f91f2 100644
--- a/src/southbridge/intel/bd82x6x/Kconfig
+++ b/src/southbridge/intel/bd82x6x/Kconfig
@@ -72,6 +72,14 @@ config GBE_BIN_PATH
depends on HAVE_GBE_BIN
default "3rdparty/mainboard/$(MAINBOARDDIR)/gbe.bin"
+config ME_BIN_PATH
+ string "Path to management engine firmware"
+ default "3rdparty/mainboard/$(MAINBOARDDIR)/me.bin"
+
+config IFD_BIN_PATH
+ string "Path to intel firmware descriptor"
+ default "3rdparty/mainboard/$(MAINBOARDDIR)/descriptor.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 2e10e0302c..e277450a45 100644
--- a/src/southbridge/intel/bd82x6x/Makefile.inc
+++ b/src/southbridge/intel/bd82x6x/Makefile.inc
@@ -54,11 +54,11 @@ romstage-y += early_spi.c
bd82x6x_add_me: $(obj)/coreboot.pre $(IFDTOOL)
printf " DD Adding Intel Firmware Descriptor\n"
- dd if=3rdparty/mainboard/$(MAINBOARDDIR)/descriptor.bin \
+ dd if=$(CONFIG_IFD_BIN_PATH) \
of=$(obj)/coreboot.pre conv=notrunc >/dev/null 2>&1
printf " IFDTOOL me.bin -> coreboot.pre\n"
$(objutil)/ifdtool/ifdtool \
- -i ME:3rdparty/mainboard/$(MAINBOARDDIR)/me.bin \
+ -i ME:$(CONFIG_ME_BIN_PATH) \
$(obj)/coreboot.pre
mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
ifeq ($(CONFIG_HAVE_GBE_BIN),y)
diff --git a/src/southbridge/intel/lynxpoint/Kconfig b/src/southbridge/intel/lynxpoint/Kconfig
index f79e963206..bd4f8d06b4 100644
--- a/src/southbridge/intel/lynxpoint/Kconfig
+++ b/src/southbridge/intel/lynxpoint/Kconfig
@@ -58,4 +58,12 @@ config SERIRQ_CONTINUOUS_MODE
If you set this option to y, the serial IRQ machine will be
operated in continuous mode.
+config ME_BIN_PATH
+ string "Path to management engine firmware"
+ default "3rdparty/mainboard/$(MAINBOARDDIR)/me.bin"
+
+config IFD_BIN_PATH
+ string "Path to intel firmware descriptor"
+ default "3rdparty/mainboard/$(MAINBOARDDIR)/descriptor.bin"
+
endif
diff --git a/src/southbridge/intel/lynxpoint/Makefile.inc b/src/southbridge/intel/lynxpoint/Makefile.inc
index 7d1f894385..8e65d55a0d 100644
--- a/src/southbridge/intel/lynxpoint/Makefile.inc
+++ b/src/southbridge/intel/lynxpoint/Makefile.inc
@@ -63,11 +63,11 @@ endif
lynxpoint_add_me: $(obj)/coreboot.pre $(IFDTOOL)
printf " DD Adding Intel Firmware Descriptor\n"
- dd if=3rdparty/mainboard/$(MAINBOARDDIR)/descriptor.bin \
+ dd if=$(CONFIG_IFD_BIN_PATH) \
of=$(obj)/coreboot.pre conv=notrunc >/dev/null 2>&1
printf " IFDTOOL me.bin -> coreboot.pre\n"
$(objutil)/ifdtool/ifdtool \
- -i ME:3rdparty/mainboard/$(MAINBOARDDIR)/me.bin \
+ -i ME:$(CONFIG_ME_BIN_PATH) \
$(obj)/coreboot.pre
mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
ifeq ($(CONFIG_LOCK_MANAGEMENT_ENGINE),y)