<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25860">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/cbfstool: Support FIT payloads<br><br>Add support for autodecting FIT (uImage) payloads and add them as new<br>CBFS_TYPE 'fit'. The payload is included as is, with no special header.<br>Support for parsing FIT payloads in coreboot is added in a follow on<br>commit.<br>Make cbfsf_file_type public to detect the payload type.<br><br>Tested on Cavium SoC.<br><br>Change-Id: Ic5fc30cd5419eb76c4eb50cca3449caea60270de<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M payloads/libpayload/include/cbfs_core.h<br>M src/commonlib/include/commonlib/cbfs_serialized.h<br>M util/cbfstool/cbfs-mkpayload.c<br>M util/cbfstool/cbfs.h<br>M util/cbfstool/cbfstool.c<br>M util/cbfstool/common.h<br>M util/nvramtool/cbfs.h<br>7 files changed, 47 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/25860/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h</span><br><span>index 1f155df..4864989 100644</span><br><span>--- a/payloads/libpayload/include/cbfs_core.h</span><br><span>+++ b/payloads/libpayload/include/cbfs_core.h</span><br><span>@@ -68,6 +68,7 @@</span><br><span> </span><br><span> #define CBFS_TYPE_STAGE 0x10</span><br><span> #define CBFS_TYPE_PAYLOAD 0x20</span><br><span style="color: hsl(120, 100%, 40%);">+#define CBFS_TYPE_FIT 0x21</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/src/commonlib/include/commonlib/cbfs_serialized.h b/src/commonlib/include/commonlib/cbfs_serialized.h</span><br><span>index 9273b35..1a090ff 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>@@ -68,6 +68,7 @@</span><br><span> #define CBFS_TYPE_DELETED2 0xffffffff</span><br><span> #define CBFS_TYPE_STAGE 0x10</span><br><span> #define CBFS_TYPE_PAYLOAD 0x20</span><br><span style="color: hsl(120, 100%, 40%);">+#define CBFS_TYPE_FIT 0x21</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-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c</span><br><span>index fd2c4ca..02d321d1 100644</span><br><span>--- a/util/cbfstool/cbfs-mkpayload.c</span><br><span>+++ b/util/cbfstool/cbfs-mkpayload.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include "cbfs.h"</span><br><span> #include "fv.h"</span><br><span> #include "coff.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "fdt.h"</span><br><span> </span><br><span> /* serialize the seg array into the buffer.</span><br><span> * The buffer is assumed to be large enough.</span><br><span>@@ -416,3 +417,35 @@</span><br><span> return 0;</span><br><span> </span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int parse_fit_to_payload(const struct buffer *input, struct buffer *output,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum comp_algo algo)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ comp_func_ptr compress;</span><br><span style="color: hsl(120, 100%, 40%);">+ int len = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct fdt_header *fdt_h;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ compress = compression_function(algo);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!compress)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUG("start: parse_fit_to_payload\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fdt_h = (struct fdt_header *)input->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (be32toh(fdt_h->magic) != FDT_HEADER_MAGIC) {</span><br><span style="color: hsl(120, 100%, 40%);">+ INFO("Not a FIT payload.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (buffer_create(output, input->size, input->name) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!compress(input->data, input->size, output->data, &len) &&</span><br><span style="color: hsl(120, 100%, 40%);">+ (unsigned int)len < input->size)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUG("done\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ output->size = len;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h</span><br><span>index 2964304..8cfd13e 100644</span><br><span>--- a/util/cbfstool/cbfs.h</span><br><span>+++ b/util/cbfstool/cbfs.h</span><br><span>@@ -172,6 +172,7 @@</span><br><span> #define CBFS_COMPONENT_CBFSHEADER 0x02</span><br><span> #define CBFS_COMPONENT_STAGE 0x10</span><br><span> #define CBFS_COMPONENT_PAYLOAD 0x20</span><br><span style="color: hsl(120, 100%, 40%);">+#define CBFS_COMPONENT_FIT 0x21</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>@@ -205,6 +206,7 @@</span><br><span> {CBFS_COMPONENT_CBFSHEADER, "cbfs header"},</span><br><span> {CBFS_COMPONENT_STAGE, "stage"},</span><br><span> {CBFS_COMPONENT_PAYLOAD, "payload"},</span><br><span style="color: hsl(120, 100%, 40%);">+ {CBFS_COMPONENT_FIT, "fit"},</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/cbfstool.c b/util/cbfstool/cbfstool.c</span><br><span>index 7156e00..e0a565d 100644</span><br><span>--- a/util/cbfstool/cbfstool.c</span><br><span>+++ b/util/cbfstool/cbfstool.c</span><br><span>@@ -631,6 +631,13 @@</span><br><span> /* per default, try and see if payload is an ELF binary */</span><br><span> ret = parse_elf_to_payload(buffer, &output, param.compression);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* If it's not an ELF, see if it's a FIT */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = parse_fit_to_payload(buffer, &output, param.compression);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ header->type = htonl(CBFS_COMPONENT_FIT);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* If it's not an ELF, see if it's a UEFI FV */</span><br><span> if (ret != 0)</span><br><span> ret = parse_fv_to_payload(buffer, &output, param.compression);</span><br><span>diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h</span><br><span>index 8bae63e..baefc1c 100644</span><br><span>--- a/util/cbfstool/common.h</span><br><span>+++ b/util/cbfstool/common.h</span><br><span>@@ -188,6 +188,8 @@</span><br><span> enum comp_algo algo);</span><br><span> int parse_fv_to_payload(const struct buffer *input, struct buffer *output,</span><br><span> enum comp_algo algo);</span><br><span style="color: hsl(120, 100%, 40%);">+int parse_fit_to_payload(const struct buffer *input, struct buffer *output,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum comp_algo algo);</span><br><span> int parse_bzImage_to_payload(const struct buffer *input,</span><br><span> struct buffer *output, const char *initrd,</span><br><span> char *cmdline, enum comp_algo algo);</span><br><span>diff --git a/util/nvramtool/cbfs.h b/util/nvramtool/cbfs.h</span><br><span>index 3a5bddb..60d95ed 100644</span><br><span>--- a/util/nvramtool/cbfs.h</span><br><span>+++ b/util/nvramtool/cbfs.h</span><br><span>@@ -68,6 +68,7 @@</span><br><span> </span><br><span> #define CBFS_TYPE_STAGE 0x10</span><br><span> #define CBFS_TYPE_PAYLOAD 0x20</span><br><span style="color: hsl(120, 100%, 40%);">+#define CBFS_TYPE_FIT 0x21</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/25860">change 25860</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/25860"/><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: Ic5fc30cd5419eb76c4eb50cca3449caea60270de </div>
<div style="display:none"> Gerrit-Change-Number: 25860 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>