<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26311">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cbfs/payload type: Fix build warning and whitespace in name, again<br><br>Currently, adding a payload to CBFS using the build system, the warning<br>below is shown.<br><br> W: Unknown type 'payload' ignored<br><br>Update payload type from "simple elf" to "simple_elf" and rename the<br>word "payload" to "simple_elf" in all Makefiles.<br>Also fix top level Makefile.inc to call cbfstool with the correct<br>add command, to make sure the self_loader still works.<br><br>Tested on real hardware using Seabios 1.11.1 as payload.<br><br>Change-Id: I1bffa04d82b1d2537f65eeaf337e92f250e6f0ff<br>---<br>M Makefile.inc<br>M payloads/Makefile.inc<br>M payloads/coreinfo/cbfs_module.c<br>M payloads/external/Makefile.inc<br>M src/arch/arm64/Makefile.inc<br>M util/cbfstool/cbfs.h<br>6 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/26311/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.inc b/Makefile.inc</span><br><span>index b11f6e2..ba73304 100644</span><br><span>--- a/Makefile.inc</span><br><span>+++ b/Makefile.inc</span><br><span>@@ -644,7 +644,7 @@</span><br><span> # 1 - Path and name of file [FILENAME: Added to cbfs-files-y list variable]</span><br><span> # 2 - Name of file in cbfs [$(FILENAME)-file]</span><br><span> # 3 - File type: [$(FILENAME)-type]</span><br><span style="color: hsl(0, 100%, 40%);">-# bootblock, cbfs header, stage, payload, optionrom, bootsplash, raw, vsa,</span><br><span style="color: hsl(120, 100%, 40%);">+# bootblock, cbfs header, stage, simple_elf, optionrom, bootsplash, raw, vsa,</span><br><span> # mbi, microcode, fsp, mrc, cmos_default, cmos_layout, spd, mrc_cache,</span><br><span> # mma, efi, deleted, null</span><br><span> # 4 - Compression type [$(FILENAME)-compression]</span><br><span>@@ -681,7 +681,7 @@</span><br><span> define cbfs-add-cmd-for-region</span><br><span> $(CBFSTOOL) $@.tmp \</span><br><span> add$(if $(filter stage,$(call extract_nth,3,$(1))),-stage)$(if \</span><br><span style="color: hsl(0, 100%, 40%);">- $(filter payload,$(call extract_nth,3,$(1))),-payload)$(if \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(filter simple_elf,$(call extract_nth,3,$(1))),-payload)$(if \</span><br><span> $(filter flat-binary,$(call extract_nth,3,$(1))),-flat-binary) \</span><br><span> -f $(call extract_nth,1,$(1)) \</span><br><span> -n $(call extract_nth,2,$(1)) \</span><br><span>diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc</span><br><span>index d894dec..ead2376 100644</span><br><span>--- a/payloads/Makefile.inc</span><br><span>+++ b/payloads/Makefile.inc</span><br><span>@@ -15,12 +15,12 @@</span><br><span> </span><br><span> cbfs-files-$(CONFIG_COREINFO_SECONDARY_PAYLOAD) += img/coreinfo</span><br><span> img/coreinfo-file := payloads/coreinfo/build/coreinfo.elf</span><br><span style="color: hsl(0, 100%, 40%);">-img/coreinfo-type := payload</span><br><span style="color: hsl(120, 100%, 40%);">+img/coreinfo-type := simple_elf</span><br><span> img/coreinfo-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)</span><br><span> </span><br><span> cbfs-files-$(CONFIG_NVRAMCUI_SECONDARY_PAYLOAD) += img/nvramcui</span><br><span> img/nvramcui-file := payloads/nvramcui/nvramcui.elf</span><br><span style="color: hsl(0, 100%, 40%);">-img/nvramcui-type := payload</span><br><span style="color: hsl(120, 100%, 40%);">+img/nvramcui-type := simple_elf</span><br><span> img/nvramcui-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)</span><br><span> </span><br><span> PAYLOADS_LIST=\</span><br><span>diff --git a/payloads/coreinfo/cbfs_module.c b/payloads/coreinfo/cbfs_module.c</span><br><span>index ee75935..b1690ba 100644</span><br><span>--- a/payloads/coreinfo/cbfs_module.c</span><br><span>+++ b/payloads/coreinfo/cbfs_module.c</span><br><span>@@ -188,7 +188,7 @@</span><br><span> mvwprintw(win, row++, 38, "stage");</span><br><span> break;</span><br><span> case COMPONENT_SELF:</span><br><span style="color: hsl(0, 100%, 40%);">- mvwprintw(win, row++, 38, "simple ELF");</span><br><span style="color: hsl(120, 100%, 40%);">+ mvwprintw(win, row++, 38, "simple_elf");</span><br><span> break;</span><br><span> case COMPONENT_OPTIONROM:</span><br><span> mvwprintw(win, row++, 38, "optionrom");</span><br><span>diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc</span><br><span>index ec7d9a8..d5e780c 100644</span><br><span>--- a/payloads/external/Makefile.inc</span><br><span>+++ b/payloads/external/Makefile.inc</span><br><span>@@ -48,7 +48,7 @@</span><br><span> ifeq ($(CONFIG_PAYLOAD_IS_FLAT_BINARY),y)</span><br><span> $(CONFIG_CBFS_PREFIX)/payload-type := flat-binary</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">-$(CONFIG_CBFS_PREFIX)/payload-type := payload</span><br><span style="color: hsl(120, 100%, 40%);">+$(CONFIG_CBFS_PREFIX)/payload-type := simple_elf</span><br><span> endif</span><br><span> $(CONFIG_CBFS_PREFIX)/payload-compression := $(CBFS_PAYLOAD_COMPRESS_FLAG)</span><br><span> $(CONFIG_CBFS_PREFIX)/payload-options := $(ADDITIONAL_PAYLOAD_CONFIG)</span><br><span>@@ -184,14 +184,14 @@</span><br><span> </span><br><span> cbfs-files-$(CONFIG_TINT_SECONDARY_PAYLOAD) += img/tint</span><br><span> img/tint-file := payloads/external/tint/tint/tint.elf</span><br><span style="color: hsl(0, 100%, 40%);">-img/tint-type := payload</span><br><span style="color: hsl(120, 100%, 40%);">+img/tint-type := simple_elf</span><br><span> img/tint-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)</span><br><span> </span><br><span> # Memtest86+</span><br><span> </span><br><span> cbfs-files-$(CONFIG_MEMTEST_SECONDARY_PAYLOAD) += img/memtest</span><br><span> img/memtest-file := payloads/external/Memtest86Plus/memtest86plus/memtest</span><br><span style="color: hsl(0, 100%, 40%);">-img/memtest-type := payload</span><br><span style="color: hsl(120, 100%, 40%);">+img/memtest-type := simple_elf</span><br><span> img/memtest-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)</span><br><span> </span><br><span> ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy)</span><br><span>diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc</span><br><span>index 997c2da..2514aa9 100644</span><br><span>--- a/src/arch/arm64/Makefile.inc</span><br><span>+++ b/src/arch/arm64/Makefile.inc</span><br><span>@@ -194,7 +194,7 @@</span><br><span> </span><br><span> BL31_CBFS := $(CONFIG_CBFS_PREFIX)/bl31</span><br><span> $(BL31_CBFS)-file := $(BL31)</span><br><span style="color: hsl(0, 100%, 40%);">-$(BL31_CBFS)-type := payload</span><br><span style="color: hsl(120, 100%, 40%);">+$(BL31_CBFS)-type := simple_elf</span><br><span> $(BL31_CBFS)-compression := $(CBFS_COMPRESS_FLAG)</span><br><span> cbfs-files-y += $(BL31_CBFS)</span><br><span> </span><br><span>diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h</span><br><span>index 1a4f101..b76e83e 100644</span><br><span>--- a/util/cbfstool/cbfs.h</span><br><span>+++ b/util/cbfstool/cbfs.h</span><br><span>@@ -204,7 +204,7 @@</span><br><span> {CBFS_COMPONENT_BOOTBLOCK, "bootblock"},</span><br><span> {CBFS_COMPONENT_CBFSHEADER, "cbfs header"},</span><br><span> {CBFS_COMPONENT_STAGE, "stage"},</span><br><span style="color: hsl(0, 100%, 40%);">- {CBFS_COMPONENT_SELF, "simple elf"},</span><br><span style="color: hsl(120, 100%, 40%);">+ {CBFS_COMPONENT_SELF, "simple_elf"},</span><br><span> {CBFS_COMPONENT_OPTIONROM, "optionrom"},</span><br><span> {CBFS_COMPONENT_BOOTSPLASH, "bootsplash"},</span><br><span> {CBFS_COMPONENT_RAW, "raw"},</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26311">change 26311</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/26311"/><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: I1bffa04d82b1d2537f65eeaf337e92f250e6f0ff </div>
<div style="display:none"> Gerrit-Change-Number: 26311 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>