<p>Denis 'GNUtoo' Carikli has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22127">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">southbridge: intel firmware: Kconfig: convert IFD options to a choice<br><br>The Kconfig help text has been inspired by the microcode<br>update help text.<br><br>Change-Id: I9b878404c507d18ddb1bd7e58fed86bc58896827<br>Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org><br>---<br>M src/southbridge/intel/common/firmware/Kconfig<br>M src/southbridge/intel/common/firmware/Makefile.inc<br>2 files changed, 39 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/22127/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/southbridge/intel/common/firmware/Kconfig b/src/southbridge/intel/common/firmware/Kconfig<br>index 6d33711..d97d0df 100644<br>--- a/src/southbridge/intel/common/firmware/Kconfig<br>+++ b/src/southbridge/intel/common/firmware/Kconfig<br>@@ -24,25 +24,57 @@<br> <br> comment "Intel Firmware"<br> <br>-config HAVE_IFD_BIN<br>+choice<br>+ prompt "Intel Flash Descriptor (IFD)"<br>+ default INCLUDE_IFD_BIN if HAVE_IFD_BIN<br>+<br>+config INCLUDE_IFD_BIN<br> bool "Add Intel descriptor.bin file"<br>+ depends on HAVE_IFD_BIN<br> help<br> The descriptor binary<br>+<br>+config FAKE_IFD_GENERATION<br>+ bool "Build with a fake Intel Flash Descriptor (IFD) binary"<br>+ help<br>+ If you don't have an Intel Firmware Descriptor (descriptor.bin) for your<br>+ board, you can select this option and coreboot will build without it.<br>+ The resulting coreboot.rom will not contain all parts required<br>+ to get coreboot running on your board. You can however write only the<br>+ BIOS section to your board's flash ROM and keep the other sections<br>+ untouched. Unfortunately the current version of flashrom doesn't<br>+ support this yet. But there is a patch pending [1].<br>+<br>+ WARNING: Never write a complete coreboot.rom to your flash ROM if it<br>+ was built with a fake IFD. It just won't work.<br>+<br>+ [1] http://www.flashrom.org/pipermail/flashrom/2013-June/011083.html<br>+<br>+endchoice<br>+<br>+##### Provided IFD #####<br>+<br>+config HAVE_IFD_BIN<br>+ bool<br>+ default n<br>+ help<br>+ This variable specifies if using a user provided descriptor.bin<br>+ is supported on given board.<br> <br> config IFD_BIN_PATH<br> string "Path and filename of the descriptor.bin file"<br> default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/descriptor.bin"<br>- depends on HAVE_IFD_BIN && !BUILD_WITH_FAKE_IFD<br>+ depends on INCLUDE_IFD_BIN && !BUILD_WITH_FAKE_IFD<br> <br> config EM100<br> bool "Configure IFD for EM100 usage"<br>- depends on HAVE_IFD_BIN && !BUILD_WITH_FAKE_IFD<br>+ depends on INCLUDE_IFD_BIN && !BUILD_WITH_FAKE_IFD<br> help<br> Set SPI frequency to 20MHz and disable Dual Output Fast Read Support<br> <br> config HAVE_ME_BIN<br> bool "Add Intel ME/TXE firmware"<br>- depends on HAVE_IFD_BIN<br>+ depends on INCLUDE_IFD_BIN<br> help<br> The Intel processor in the selected system requires a special firmware<br> for an integrated controller. This might be called the Management<br>@@ -105,7 +137,7 @@<br> <br> config HAVE_GBE_BIN<br> bool "Add gigabit ethernet firmware"<br>- depends on HAVE_IFD_BIN<br>+ depends on INCLUDE_IFD_BIN<br> help<br> The integrated gigabit ethernet controller needs a firmware file.<br> Select this if you are going to use the PCH integrated controller<br>@@ -118,7 +150,7 @@<br> <br> config HAVE_EC_BIN<br> bool "Add EC firmware"<br>- depends on HAVE_IFD_BIN<br>+ depends on INCLUDE_IFD_BIN<br> help<br> The embedded controller needs a firmware file.<br> <br>@@ -132,22 +164,6 @@<br> default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/ec.bin"<br> <br> ##### Fake IFD #####<br>-<br>-config BUILD_WITH_FAKE_IFD<br>- bool "Build with a fake IFD" if !HAVE_IFD_BIN<br>- help<br>- If you don't have an Intel Firmware Descriptor (descriptor.bin) for your<br>- board, you can select this option and coreboot will build without it.<br>- The resulting coreboot.rom will not contain all parts required<br>- to get coreboot running on your board. You can however write only the<br>- BIOS section to your board's flash ROM and keep the other sections<br>- untouched. Unfortunately the current version of flashrom doesn't<br>- support this yet. But there is a patch pending [1].<br>-<br>- WARNING: Never write a complete coreboot.rom to your flash ROM if it<br>- was built with a fake IFD. It just won't work.<br>-<br>- [1] http://www.flashrom.org/pipermail/flashrom/2013-June/011083.html<br> <br> config IFD_BIOS_SECTION<br> depends on BUILD_WITH_FAKE_IFD<br>diff --git a/src/southbridge/intel/common/firmware/Makefile.inc b/src/southbridge/intel/common/firmware/Makefile.inc<br>index d6e6296..58a7e23 100644<br>--- a/src/southbridge/intel/common/firmware/Makefile.inc<br>+++ b/src/southbridge/intel/common/firmware/Makefile.inc<br>@@ -20,7 +20,7 @@<br> # that adds additional components to the final firmware<br> # image outside of CBFS<br> <br>-ifeq ($(CONFIG_HAVE_IFD_BIN),y)<br>+ifeq ($(CONFIG_INCLUDE_IFD_BIN),y)<br> INTERMEDIATE+=add_intel_firmware<br> endif<br> <br></pre><p>To view, visit <a href="https://review.coreboot.org/22127">change 22127</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/22127"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I9b878404c507d18ddb1bd7e58fed86bc58896827 </div>
<div style="display:none"> Gerrit-Change-Number: 22127 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> </div>