<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25986">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cbfs: Rename CBFS_TYPE_PAYLOAD to CBFS_TYPE_SELF<br><br>In preparation of having FIT payloads, which aren't converted to simple ELF,<br>rename the CBFS type payload to actually show the format the payload is<br>encoded in.<br><br>Another type CBFS_TYPE_FIT will be added to have two different payload<br>formats. For now this is only a cosmetic change.<br><br>Change-Id: I39ee590d063b3e90f6153fe655aa50e58d45e8b0<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M payloads/coreinfo/cbfs_module.c<br>M payloads/libpayload/include/cbfs_core.h<br>M payloads/libpayload/libcbfs/cbfs.c<br>M src/commonlib/include/commonlib/cbfs_serialized.h<br>M util/cbfstool/cbfs.h<br>M util/cbfstool/cbfs_image.c<br>M util/cbfstool/cbfstool.c<br>M util/nvramtool/cbfs.h<br>8 files changed, 14 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/25986/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/coreinfo/cbfs_module.c b/payloads/coreinfo/cbfs_module.c</span><br><span>index d9f7b24..ee75935 100644</span><br><span>--- a/payloads/coreinfo/cbfs_module.c</span><br><span>+++ b/payloads/coreinfo/cbfs_module.c</span><br><span>@@ -28,7 +28,7 @@</span><br><span> #define COMPONENT_BOOTBLOCK 0x01</span><br><span> #define COMPONENT_CBFSHEADER 0x02</span><br><span> #define COMPONENT_STAGE 0x10</span><br><span style="color: hsl(0, 100%, 40%);">-#define COMPONENT_PAYLOAD 0x20</span><br><span style="color: hsl(120, 100%, 40%);">+#define COMPONENT_SELF 0x20</span><br><span> #define COMPONENT_OPTIONROM 0x30</span><br><span> #define COMPONENT_RAW 0x50</span><br><span> #define COMPONENT_MICROCODE 0x53</span><br><span>@@ -187,8 +187,8 @@</span><br><span> case COMPONENT_STAGE:</span><br><span> mvwprintw(win, row++, 38, "stage");</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case COMPONENT_PAYLOAD:</span><br><span style="color: hsl(0, 100%, 40%);">- mvwprintw(win, row++, 38, "payload");</span><br><span style="color: hsl(120, 100%, 40%);">+ case COMPONENT_SELF:</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/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h</span><br><span>index 1f155df..da98604 100644</span><br><span>--- a/payloads/libpayload/include/cbfs_core.h</span><br><span>+++ b/payloads/libpayload/include/cbfs_core.h</span><br><span>@@ -67,7 +67,7 @@</span><br><span> components */</span><br><span> </span><br><span> #define CBFS_TYPE_STAGE 0x10</span><br><span style="color: hsl(0, 100%, 40%);">-#define CBFS_TYPE_PAYLOAD 0x20</span><br><span style="color: hsl(120, 100%, 40%);">+#define CBFS_TYPE_SELF 0x20</span><br><span> #define CBFS_TYPE_OPTIONROM 0x30</span><br><span> #define CBFS_TYPE_BOOTSPLASH 0x40</span><br><span> #define CBFS_TYPE_RAW 0x50</span><br><span>diff --git a/payloads/libpayload/libcbfs/cbfs.c b/payloads/libpayload/libcbfs/cbfs.c</span><br><span>index 3cce799..f087eaa 100644</span><br><span>--- a/payloads/libpayload/libcbfs/cbfs.c</span><br><span>+++ b/payloads/libpayload/libcbfs/cbfs.c</span><br><span>@@ -158,7 +158,7 @@</span><br><span> void *cbfs_load_payload(struct cbfs_media *media, const char *name)</span><br><span> {</span><br><span> return (struct cbfs_payload *)cbfs_get_file_content(</span><br><span style="color: hsl(0, 100%, 40%);">- media, name, CBFS_TYPE_PAYLOAD, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ media, name, CBFS_TYPE_SELF, NULL);</span><br><span> }</span><br><span> </span><br><span> struct cbfs_file *cbfs_find(const char *name) {</span><br><span>diff --git a/src/commonlib/include/commonlib/cbfs_serialized.h b/src/commonlib/include/commonlib/cbfs_serialized.h</span><br><span>index 9273b35..53b701a 100644</span><br><span>--- a/src/commonlib/include/commonlib/cbfs_serialized.h</span><br><span>+++ b/src/commonlib/include/commonlib/cbfs_serialized.h</span><br><span>@@ -67,7 +67,7 @@</span><br><span> #define CBFS_TYPE_DELETED 0x00000000</span><br><span> #define CBFS_TYPE_DELETED2 0xffffffff</span><br><span> #define CBFS_TYPE_STAGE 0x10</span><br><span style="color: hsl(0, 100%, 40%);">-#define CBFS_TYPE_PAYLOAD 0x20</span><br><span style="color: hsl(120, 100%, 40%);">+#define CBFS_TYPE_SELF 0x20</span><br><span> #define CBFS_TYPE_OPTIONROM 0x30</span><br><span> #define CBFS_TYPE_BOOTSPLASH 0x40</span><br><span> #define CBFS_TYPE_RAW 0x50</span><br><span>diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h</span><br><span>index 2964304..1a4f101 100644</span><br><span>--- a/util/cbfstool/cbfs.h</span><br><span>+++ b/util/cbfstool/cbfs.h</span><br><span>@@ -171,7 +171,7 @@</span><br><span> #define CBFS_COMPONENT_BOOTBLOCK 0x01</span><br><span> #define CBFS_COMPONENT_CBFSHEADER 0x02</span><br><span> #define CBFS_COMPONENT_STAGE 0x10</span><br><span style="color: hsl(0, 100%, 40%);">-#define CBFS_COMPONENT_PAYLOAD 0x20</span><br><span style="color: hsl(120, 100%, 40%);">+#define CBFS_COMPONENT_SELF 0x20</span><br><span> #define CBFS_COMPONENT_OPTIONROM 0x30</span><br><span> #define CBFS_COMPONENT_BOOTSPLASH 0x40</span><br><span> #define CBFS_COMPONENT_RAW 0x50</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_PAYLOAD, "payload"},</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>diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c</span><br><span>index 306fc29..e533483 100644</span><br><span>--- a/util/cbfstool/cbfs_image.c</span><br><span>+++ b/util/cbfstool/cbfs_image.c</span><br><span>@@ -1328,7 +1328,7 @@</span><br><span> buffer_delete(&buffer);</span><br><span> return -1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ntohl(entry->type) == CBFS_COMPONENT_PAYLOAD) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (ntohl(entry->type) == CBFS_COMPONENT_SELF) {</span><br><span> if (cbfs_payload_make_elf(&buffer, arch)) {</span><br><span> buffer_delete(&buffer);</span><br><span> return -1;</span><br><span>@@ -1522,7 +1522,7 @@</span><br><span> CBFS_SUBHEADER(entry), fp);</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- case CBFS_COMPONENT_PAYLOAD:</span><br><span style="color: hsl(120, 100%, 40%);">+ case CBFS_COMPONENT_SELF:</span><br><span> payload = (struct cbfs_payload_segment *)</span><br><span> CBFS_SUBHEADER(entry);</span><br><span> while (payload) {</span><br><span>diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c</span><br><span>index d4de409..27e4cae 100644</span><br><span>--- a/util/cbfstool/cbfstool.c</span><br><span>+++ b/util/cbfstool/cbfstool.c</span><br><span>@@ -410,7 +410,7 @@</span><br><span> if (type == CBFS_COMPONENT_STAGE)</span><br><span> attrs->position = htonl(offset +</span><br><span> sizeof(struct cbfs_stage));</span><br><span style="color: hsl(0, 100%, 40%);">- else if (type == CBFS_COMPONENT_PAYLOAD)</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (type == CBFS_COMPONENT_SELF)</span><br><span> attrs->position = htonl(offset +</span><br><span> sizeof(struct cbfs_payload));</span><br><span> else</span><br><span>@@ -737,7 +737,7 @@</span><br><span> {</span><br><span> return cbfs_add_component(param.filename,</span><br><span> param.name,</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_COMPONENT_PAYLOAD,</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_COMPONENT_SELF,</span><br><span> param.baseaddress,</span><br><span> param.headeroffset,</span><br><span> cbfstool_convert_mkpayload);</span><br><span>@@ -757,7 +757,7 @@</span><br><span> }</span><br><span> return cbfs_add_component(param.filename,</span><br><span> param.name,</span><br><span style="color: hsl(0, 100%, 40%);">- CBFS_COMPONENT_PAYLOAD,</span><br><span style="color: hsl(120, 100%, 40%);">+ CBFS_COMPONENT_SELF,</span><br><span> param.baseaddress,</span><br><span> param.headeroffset,</span><br><span> cbfstool_convert_mkflatpayload);</span><br><span>diff --git a/util/nvramtool/cbfs.h b/util/nvramtool/cbfs.h</span><br><span>index 3a5bddb..212aff9 100644</span><br><span>--- a/util/nvramtool/cbfs.h</span><br><span>+++ b/util/nvramtool/cbfs.h</span><br><span>@@ -67,7 +67,7 @@</span><br><span> components */</span><br><span> </span><br><span> #define CBFS_TYPE_STAGE 0x10</span><br><span style="color: hsl(0, 100%, 40%);">-#define CBFS_TYPE_PAYLOAD 0x20</span><br><span style="color: hsl(120, 100%, 40%);">+#define CBFS_TYPE_SELF 0x20</span><br><span> #define CBFS_TYPE_OPTIONROM 0x30</span><br><span> #define CBFS_TYPE_BOOTSPLASH 0x40</span><br><span> #define CBFS_TYPE_RAW 0x50</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25986">change 25986</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/25986"/><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: I39ee590d063b3e90f6153fe655aa50e58d45e8b0 </div>
<div style="display:none"> Gerrit-Change-Number: 25986 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>