<p>Joel Kitching has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29025">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cbfstool: make comments more consistent<br><br>Fix a typo and make comments more consistent (start with<br>capital letter).<br><br>BUG=None<br>TEST=None<br><br>Change-Id: I97bff5e05596fc6973f0729e276a2e45b291120d<br>---<br>M util/cbfstool/cbfstool.c<br>1 file changed, 15 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/29025/1</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 f8b1f65..28e0e5d 100644</span><br><span>--- a/util/cbfstool/cbfstool.c</span><br><span>+++ b/util/cbfstool/cbfstool.c</span><br><span>@@ -87,7 +87,7 @@</span><br><span> enum comp_algo compression;</span><br><span> int precompression;</span><br><span> enum vb2_hash_algorithm hash;</span><br><span style="color: hsl(0, 100%, 40%);">- /* for linux payloads */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* For linux payloads */</span><br><span> char *initrd;</span><br><span> char *cmdline;</span><br><span> int force;</span><br><span>@@ -140,7 +140,7 @@</span><br><span> {</span><br><span> assert(region);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* cover the situation where a negative base address is given by the</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Cover the situation where a negative base address is given by the</span><br><span> * user. Callers of this function negate it, so it'll be a positive</span><br><span> * number smaller than the region.</span><br><span> */</span><br><span>@@ -283,7 +283,7 @@</span><br><span> </span><br><span> static void fill_header_offset(void *location, uint32_t offset)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- // TODO: when we have a BE target, we'll need to store this as BE</span><br><span style="color: hsl(120, 100%, 40%);">+ // TODO: When we have a BE target, we'll need to store this as BE</span><br><span> write_le32(location, offset);</span><br><span> }</span><br><span> </span><br><span>@@ -384,7 +384,7 @@</span><br><span> buffer_size(&image.buffer) - 4);</span><br><span> fill_header_offset(h_loc, header_offset);</span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * if top swap present, update the header</span><br><span style="color: hsl(120, 100%, 40%);">+ * If top swap present, update the header</span><br><span> * location in secondary bootblock</span><br><span> */</span><br><span> if (param.topswap_size) {</span><br><span>@@ -413,7 +413,7 @@</span><br><span> }</span><br><span> </span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * allocate topswap_size*2 bytes for bootblock to</span><br><span style="color: hsl(120, 100%, 40%);">+ * Allocate topswap_size*2 bytes for bootblock to</span><br><span> * accommodate the second bootblock.</span><br><span> */</span><br><span> struct buffer new_bootblock, bb1, bb2;</span><br><span>@@ -427,15 +427,15 @@</span><br><span> buffer_size(&new_bootblock) - bb_buf_size,</span><br><span> bb_buf_size);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* copy to first bootblock */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Copy to first bootblock */</span><br><span> memcpy(buffer_get(&bb1), buffer_get(buffer), bb_buf_size);</span><br><span style="color: hsl(0, 100%, 40%);">- /* copy to second bootblock */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Copy to second bootblock */</span><br><span> memcpy(buffer_get(&bb2), buffer_get(buffer), bb_buf_size);</span><br><span> </span><br><span> buffer_delete(buffer);</span><br><span> buffer_clone(buffer, &new_bootblock);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* update the location (offset) of bootblock in the region */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Update the location (offset) of bootblock in the region */</span><br><span> *offset = convert_to_from_top_aligned(param.image_region,</span><br><span> buffer_size(buffer));</span><br><span> </span><br><span>@@ -633,7 +633,6 @@</span><br><span> * mapped one.</span><br><span> * If the FSP component is not xip, then use param.baseaddress that is</span><br><span> * passed in by the caller.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span> */</span><br><span> if (param.stage_xip) {</span><br><span> if (!IS_TOP_ALIGNED_ADDRESS(address))</span><br><span>@@ -711,7 +710,7 @@</span><br><span> </span><br><span> /*</span><br><span> * Ensure the address is a memory mapped one. This assumes</span><br><span style="color: hsl(0, 100%, 40%);">- * x86 semantics about th boot media being directly mapped</span><br><span style="color: hsl(120, 100%, 40%);">+ * x86 semantics about the boot media being directly mapped</span><br><span> * below 4GiB in the CPU address space.</span><br><span> **/</span><br><span> address = -convert_to_from_absolute_top_aligned(</span><br><span>@@ -727,7 +726,7 @@</span><br><span> if (ret != 0)</span><br><span> return -1;</span><br><span> buffer_delete(buffer);</span><br><span style="color: hsl(0, 100%, 40%);">- // direct assign, no dupe.</span><br><span style="color: hsl(120, 100%, 40%);">+ // Direct assign, no dupe.</span><br><span> memcpy(buffer, &output, sizeof(*buffer));</span><br><span> header->len = htonl(output.size);</span><br><span> return 0;</span><br><span>@@ -738,7 +737,7 @@</span><br><span> {</span><br><span> struct buffer output;</span><br><span> int ret;</span><br><span style="color: hsl(0, 100%, 40%);">- /* per default, try and see if payload is an ELF binary */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 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> /* If it's not an ELF, see if it's a FIT */</span><br><span>@@ -765,7 +764,7 @@</span><br><span> }</span><br><span> </span><br><span> buffer_delete(buffer);</span><br><span style="color: hsl(0, 100%, 40%);">- // direct assign, no dupe.</span><br><span style="color: hsl(120, 100%, 40%);">+ // Direct assign, no dupe.</span><br><span> memcpy(buffer, &output, sizeof(*buffer));</span><br><span> header->len = htonl(output.size);</span><br><span> return 0;</span><br><span>@@ -782,7 +781,7 @@</span><br><span> return -1;</span><br><span> }</span><br><span> buffer_delete(buffer);</span><br><span style="color: hsl(0, 100%, 40%);">- // direct assign, no dupe.</span><br><span style="color: hsl(120, 100%, 40%);">+ // Direct assign, no dupe.</span><br><span> memcpy(buffer, &output, sizeof(*buffer));</span><br><span> header->len = htonl(output.size);</span><br><span> return 0;</span><br><span>@@ -1215,7 +1214,7 @@</span><br><span> uint32_t addr = 0;</span><br><span> </span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * get the address of provided region for first row.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Get the address of provided region for first row.</span><br><span> */</span><br><span> if (param.ucode_region) {</span><br><span> struct buffer ucode;</span><br><span>@@ -1558,7 +1557,7 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* filter out illegal long options */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Filter out illegal long options */</span><br><span> if (strchr(commands[i].optstring, c) == NULL) {</span><br><span> /* TODO maybe print actual long option instead */</span><br><span> ERROR("%s: invalid option -- '%c'\n",</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29025">change 29025</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/29025"/><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: I97bff5e05596fc6973f0729e276a2e45b291120d </div>
<div style="display:none"> Gerrit-Change-Number: 29025 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joel Kitching <kitching@google.com> </div>