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>
This commit is contained in:
parent
9cb0941cb2
commit
3cc151ede0
|
@ -72,6 +72,14 @@ config GBE_BIN_PATH
|
||||||
depends on HAVE_GBE_BIN
|
depends on HAVE_GBE_BIN
|
||||||
default "3rdparty/mainboard/$(MAINBOARDDIR)/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
|
config LOCK_MANAGEMENT_ENGINE
|
||||||
bool "Lock Management Engine section"
|
bool "Lock Management Engine section"
|
||||||
default n
|
default n
|
||||||
|
|
|
@ -54,11 +54,11 @@ romstage-y += early_spi.c
|
||||||
|
|
||||||
bd82x6x_add_me: $(obj)/coreboot.pre $(IFDTOOL)
|
bd82x6x_add_me: $(obj)/coreboot.pre $(IFDTOOL)
|
||||||
printf " DD Adding Intel Firmware Descriptor\n"
|
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
|
of=$(obj)/coreboot.pre conv=notrunc >/dev/null 2>&1
|
||||||
printf " IFDTOOL me.bin -> coreboot.pre\n"
|
printf " IFDTOOL me.bin -> coreboot.pre\n"
|
||||||
$(objutil)/ifdtool/ifdtool \
|
$(objutil)/ifdtool/ifdtool \
|
||||||
-i ME:3rdparty/mainboard/$(MAINBOARDDIR)/me.bin \
|
-i ME:$(CONFIG_ME_BIN_PATH) \
|
||||||
$(obj)/coreboot.pre
|
$(obj)/coreboot.pre
|
||||||
mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
|
mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
|
||||||
ifeq ($(CONFIG_HAVE_GBE_BIN),y)
|
ifeq ($(CONFIG_HAVE_GBE_BIN),y)
|
||||||
|
|
|
@ -58,4 +58,12 @@ config SERIRQ_CONTINUOUS_MODE
|
||||||
If you set this option to y, the serial IRQ machine will be
|
If you set this option to y, the serial IRQ machine will be
|
||||||
operated in continuous mode.
|
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
|
endif
|
||||||
|
|
|
@ -63,11 +63,11 @@ endif
|
||||||
|
|
||||||
lynxpoint_add_me: $(obj)/coreboot.pre $(IFDTOOL)
|
lynxpoint_add_me: $(obj)/coreboot.pre $(IFDTOOL)
|
||||||
printf " DD Adding Intel Firmware Descriptor\n"
|
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
|
of=$(obj)/coreboot.pre conv=notrunc >/dev/null 2>&1
|
||||||
printf " IFDTOOL me.bin -> coreboot.pre\n"
|
printf " IFDTOOL me.bin -> coreboot.pre\n"
|
||||||
$(objutil)/ifdtool/ifdtool \
|
$(objutil)/ifdtool/ifdtool \
|
||||||
-i ME:3rdparty/mainboard/$(MAINBOARDDIR)/me.bin \
|
-i ME:$(CONFIG_ME_BIN_PATH) \
|
||||||
$(obj)/coreboot.pre
|
$(obj)/coreboot.pre
|
||||||
mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
|
mv $(obj)/coreboot.pre.new $(obj)/coreboot.pre
|
||||||
ifeq ($(CONFIG_LOCK_MANAGEMENT_ENGINE),y)
|
ifeq ($(CONFIG_LOCK_MANAGEMENT_ENGINE),y)
|
||||||
|
|
Loading…
Reference in New Issue