<p>Martin Roth <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/25590">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/cbfstool: Print all supported architectures<br><br>The list of supported architectures in the usage output of cbfstool is<br>currently hardcoded and outdated.<br><br>Use the arch_names array in common.c to provide and up-to-date list.<br><br>Change-Id: I3e7ed67c3bfd928b304c314fcc8e1bea35561662<br>Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net><br>Reviewed-on: https://review.coreboot.org/25590<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Patrick Georgi <pgeorgi@google.com><br>---<br>M util/cbfstool/cbfstool.c<br>M util/cbfstool/common.c<br>M util/cbfstool/common.h<br>3 files changed, 17 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c</span><br><span>index 1f71906..7156e00 100644</span><br><span>--- a/util/cbfstool/cbfstool.c</span><br><span>+++ b/util/cbfstool/cbfstool.c</span><br><span>@@ -1350,10 +1350,11 @@</span><br><span>            "  in two possible formats: if their value is greater than\n"</span><br><span>              "  0x80000000, they are interpreted as a top-aligned x86 memory\n"</span><br><span>         "  address; otherwise, they are treated as an offset into flash.\n"</span><br><span style="color: hsl(0, 100%, 40%);">-           "ARCHes:\n"</span><br><span style="color: hsl(0, 100%, 40%);">-           "  arm64, arm, mips, x86\n"</span><br><span style="color: hsl(0, 100%, 40%);">-           "TYPEs:\n", name, name</span><br><span style="color: hsl(120, 100%, 40%);">+      "ARCHes:\n", name, name</span><br><span>           );</span><br><span style="color: hsl(120, 100%, 40%);">+        print_supported_architectures();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    printf("TYPEs:\n");</span><br><span>        print_supported_filetypes();</span><br><span> </span><br><span>     printf(</span><br><span>diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c</span><br><span>index 72ff745..14ccaa9 100644</span><br><span>--- a/util/cbfstool/common.c</span><br><span>+++ b/util/cbfstool/common.c</span><br><span>@@ -168,6 +168,18 @@</span><br><span>  return ret;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void print_supported_architectures(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+     size_t i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   for (i = 0; i < ARRAY_SIZE(arch_names); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+             printf(i == 0? "  ":", ");</span><br><span style="color: hsl(120, 100%, 40%);">+                printf("%s", arch_names[i].name);</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%);">+   printf("\n");</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void print_supported_filetypes(void)</span><br><span> {</span><br><span>    int i, number = ARRAY_SIZE(filetypes);</span><br><span>diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h</span><br><span>index 85dfdeb..8bae63e 100644</span><br><span>--- a/util/cbfstool/common.h</span><br><span>+++ b/util/cbfstool/common.h</span><br><span>@@ -204,6 +204,7 @@</span><br><span> int parse_elf_to_xip_stage(const struct buffer *input, struct buffer *output,</span><br><span>                           uint32_t *location, const char *ignore_section);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void print_supported_architectures(void);</span><br><span> void print_supported_filetypes(void);</span><br><span> </span><br><span> /* lzma/lzma.c */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25590">change 25590</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/25590"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3e7ed67c3bfd928b304c314fcc8e1bea35561662 </div>
<div style="display:none"> Gerrit-Change-Number: 25590 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Jonathan Neuschäfer <j.neuschaefer@gmx.net> </div>
<div style="display:none"> Gerrit-Reviewer: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>