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