summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiyuan Wang <wangsiyuanbuaa@gmail.com>2013-04-03 17:02:58 +0800
committerRonald G. Minnich <rminnich@gmail.com>2013-04-03 18:01:44 +0200
commit64a7ed6dfae7e8d780930aad153f15e2c48753c3 (patch)
tree192a34fd614345a293d2ea22307055772056335c
parentb81754becae18d54915a3d724ee5c0f1dfb096d5 (diff)
Add PXE ROM selection to Kconfig menu
Adding a pxe rom manually is inconvenient. With this patch, PXE ROM can be added automatically by selecting PXE_ROM in Kconfig. I have tested this patch on AMD Parmer and Thatcher with iPXE. iPXE would be a boot device in Seabios when pressing F12. iPXE works well with coreboot and Seabios. Change-Id: I2c4fc73fd9ae6c979f0af2290d410935f600e2c8 Signed-off-by: Siyuan Wang <SiYuan.Wang@amd.com> Signed-off-by: Siyuan Wang <wangsiyuanbuaa@gmail.com> Reviewed-on: http://review.coreboot.org/3013 Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones@se-eng.com> Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--src/arch/x86/Makefile.inc3
-rw-r--r--src/device/Kconfig31
2 files changed, 34 insertions, 0 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index bbf2336043..ee2bc4713d 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -113,6 +113,9 @@ endif
ifeq ($(CONFIG_VBOOT_VERIFY_FIRMWARE),y)
$(CBFSTOOL) $@.tmp add-stage -f $(VBOOT_STUB_ELF) -n $(CONFIG_CBFS_PREFIX)/vboot -c $(CBFS_COMPRESS_FLAG)
endif
+ifeq ($(CONFIG_PXE_ROM),y)
+ $(CBFSTOOL) $@.tmp add -f $(CONFIG_PXE_ROM_FILE) -n pci$(CONFIG_PXE_ROM_ID).rom -t raw
+endif
mv $@.tmp $@
@printf " CBFSPRINT $(subst $(obj)/,,$(@))\n\n"
$(CBFSTOOL) $@ print
diff --git a/src/device/Kconfig b/src/device/Kconfig
index 159bc0e76b..ca2fb33028 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -467,3 +467,34 @@ config BOOTSPLASH_FILE
The path and filename of the file to use as graphical bootsplash
screen. The file format has to be jpg.
endmenu
+
+menu "PXE ROM"
+config PXE_ROM
+ bool "Add a PXE ROM image"
+ help
+ Select this option if you have a PXE ROM image that you would
+ like to add to your ROM.
+
+config PXE_ROM_FILE
+ string "PXE ROM filename"
+ depends on PXE_ROM
+ default "pxe.rom"
+ help
+ The path and filename of the file to use as PXE ROM.
+
+config PXE_ROM_ID
+ string "network card PCI IDs"
+ depends on PXE_ROM
+ default "10ec,8168"
+ help
+ The comma-separated PCI vendor and device ID that would associate
+ your PXE ROM to your network card.
+
+ Example: 10ec,8168
+
+ In the above example 10ec is the PCI vendor ID (in hex, but without
+ the "0x" prefix) and 8168 specifies the PCI device ID of the
+ network card (also in hex, without "0x" prefix).
+
+ Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.
+endmenu