<p>Piotr Król would like Michał Żygowski to <strong>review</strong> this change.</p><p><a href="https://review.coreboot.org/27302">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">payloads/iPXE: add iPXE serial enable option<br><br>Since SeaBIOS 1.11.0 implements serial console and etc/sercon-port<br>runtime config file is present in CBFS, SeaBIOS additionally<br>redirects iPXE output to configured IO port. For boards which use<br>the same UART for SeaBIOS and iPXE console it causes doubled<br>output.<br><br>The option is enabled by default and passes UART configuration<br>to iPXE Makefile as before. When unselected, only SeaBIOS handles<br>printing output from iPXE.<br><br>Change-Id: Ia3c74cfbee4f816782161fcff286a14f46be78c5<br>Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com><br>Signed-off-by: Piotr Król <piotr.krol@3mdeb.com><br>---<br>M payloads/external/Makefile.inc<br>M payloads/external/iPXE/Kconfig<br>2 files changed, 16 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/27302/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc</span><br><span>index 3943db9..1d3e7a1 100644</span><br><span>--- a/payloads/external/Makefile.inc</span><br><span>+++ b/payloads/external/Makefile.inc</span><br><span>@@ -234,6 +234,12 @@</span><br><span> IPXE_UART=COM$(call int-add,$(CONFIG_UART_FOR_CONSOLE) 1)</span><br><span> endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ifeq ($(CONFIG_PXE_SERIAL_CONSOLE),y)</span><br><span style="color: hsl(120, 100%, 40%);">+IPXE_SERIAL_CONSOLE = $(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO)</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+IPXE_SERIAL_CONSOLE = n</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> cbfs-files-$(CONFIG_PXE_ROM)$(CONFIG_BUILD_IPXE) += pci$(CONFIG_PXE_ROM_ID).rom</span><br><span> pci$(CONFIG_PXE_ROM_ID).rom-file := $(PXE_ROM_FILE)</span><br><span> pci$(CONFIG_PXE_ROM_ID).rom-type := raw</span><br><span>@@ -244,7 +250,7 @@</span><br><span> PXE_ROM_PCI_ID=$(PXE_ROM_PCI_ID) \</span><br><span> CONFIG_IPXE_MASTER=$(CONFIG_IPXE_MASTER) \</span><br><span> CONFIG_IPXE_STABLE=$(CONFIG_IPXE_STABLE) \</span><br><span style="color: hsl(0, 100%, 40%);">- CONSOLE_SERIAL=$(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO) \</span><br><span style="color: hsl(120, 100%, 40%);">+ CONSOLE_SERIAL=$(IPXE_SERIAL_CONSOLE) \</span><br><span> IPXE_UART=$(IPXE_UART) \</span><br><span> CONFIG_TTYS0_BAUD=$(CONFIG_TTYS0_BAUD) \</span><br><span> MFLAGS= MAKEFLAGS=</span><br><span>diff --git a/payloads/external/iPXE/Kconfig b/payloads/external/iPXE/Kconfig</span><br><span>index 82114107..ce0a7ae 100644</span><br><span>--- a/payloads/external/iPXE/Kconfig</span><br><span>+++ b/payloads/external/iPXE/Kconfig</span><br><span>@@ -78,5 +78,14 @@</span><br><span> </span><br><span> Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config PXE_SERIAL_CONSOLE</span><br><span style="color: hsl(120, 100%, 40%);">+ bool "Enable iPXE serial console"</span><br><span style="color: hsl(120, 100%, 40%);">+ def_bool y</span><br><span style="color: hsl(120, 100%, 40%);">+ help</span><br><span style="color: hsl(120, 100%, 40%);">+ Enable/disable iPXE serial console. Since SeaBIOS supports serial</span><br><span style="color: hsl(120, 100%, 40%);">+ console this option might be helpful to avoid duplicated output.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ Unselect to let only SeaBIOS handle printing output.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> endmenu</span><br><span> endif</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27302">change 27302</a>. To unsubscribe, or for help writing mail filters, 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/27302"/><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: Ia3c74cfbee4f816782161fcff286a14f46be78c5 </div>
<div style="display:none"> Gerrit-Change-Number: 27302 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Piotr Król <piotr.krol@3mdeb.com> </div>
<div style="display:none"> Gerrit-Reviewer: Michał Żygowski <michal.zygowski@3mdeb.com> </div>