payloads/iPXE: Fix PXE Kconfig question

As reported by Andrew Engelbrecht on the coreboot mailing list, there
was an issue when selecting the pxe rom file:

When using "make menuconfig", if "add pxe rom" is selected, then
the field below to set to the path of the pxe rom, the "add pxe rom"
option gets disabled.

This problem seems to be due to the use of the 'optional' Kconfig
keyword, so this section of the Kconfig is rewitten here to remove that
keyword and fix the issue.

Change-Id: I51680cb746160cb853c8679ac64e2d37989cb574
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/15555
Tested-by: build bot (Jenkins)
Reviewed-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Martin Roth 2016-07-06 15:05:19 -06:00
parent bfe6f6a72e
commit e51e1045e4
1 changed files with 12 additions and 4 deletions

View File

@ -11,11 +11,17 @@
## GNU General Public License for more details. ## GNU General Public License for more details.
## ##
choice config PXE
prompt "Add a PXE ROM" prompt "Add a PXE ROM"
default PXE_ROM def_bool n
depends on ARCH_X86 depends on ARCH_X86
optional
if PXE
menu "PXE Options"
choice
prompt "PXE ROM to use"
default PXE_ROM
config PXE_ROM config PXE_ROM
bool "Add an existing PXE ROM image" bool "Add an existing PXE ROM image"
@ -59,7 +65,6 @@ config PXE_ROM_FILE
config PXE_ROM_ID config PXE_ROM_ID
string "network card PCI IDs" string "network card PCI IDs"
depends on PXE_ROM || BUILD_IPXE
default "10ec,8168" default "10ec,8168"
help help
The comma-separated PCI vendor and device ID that would associate The comma-separated PCI vendor and device ID that would associate
@ -72,3 +77,6 @@ config PXE_ROM_ID
network card (also in hex, without "0x" prefix). network card (also in hex, without "0x" prefix).
Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices. Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.
endmenu
endif