summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/cbfstool/cbfs-mkpayload.c2
-rw-r--r--util/cbfstool/cbfs_image.c2
-rw-r--r--util/cbfstool/elfheaders.c2
-rw-r--r--util/cbfstool/fit.c2
-rw-r--r--util/cbfstool/ifwitool.c6
-rw-r--r--util/cbfstool/rmodule.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index d6c10adc7e..830fe16fc1 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -115,7 +115,7 @@ int parse_elf_to_payload(const struct buffer *input, struct buffer *output,
}
/* Now, regular headers - we only care about PT_LOAD headers,
- * because thats what we're actually going to load
+ * because that's what we're actually going to load
*/
for (i = 0; i < headers; i++) {
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index 452c9d9a04..9bf3688304 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -576,7 +576,7 @@ int cbfs_compact_instance(struct cbfs_image *image)
continue;
/* At this point prev is an empty entry. Put the non-empty
- * file in prev's location. Then add a new emptry entry. This
+ * file in prev's location. Then add a new empty entry. This
* essentialy bubbles empty entries towards the end. */
prev_size = cbfs_file_entry_size(prev);
diff --git a/util/cbfstool/elfheaders.c b/util/cbfstool/elfheaders.c
index 676a635b8a..53fe7a1fca 100644
--- a/util/cbfstool/elfheaders.c
+++ b/util/cbfstool/elfheaders.c
@@ -658,7 +658,7 @@ void elf_init_eheader(Elf64_Ehdr *ehdr, int machine, int nbits, int endian)
}
}
-/* Arbitray maximum number of sections. */
+/* Arbitrary maximum number of sections. */
#define MAX_SECTIONS 16
struct elf_writer_section {
Elf64_Shdr shdr;
diff --git a/util/cbfstool/fit.c b/util/cbfstool/fit.c
index ee12c96610..8ba50f7919 100644
--- a/util/cbfstool/fit.c
+++ b/util/cbfstool/fit.c
@@ -172,7 +172,7 @@ static inline size_t fit_free_space(struct fit_table *fit,
* This one is critical, as mentioned in Chapter 1.2.1 "FIT Ordering Rules"
* "Firmware Interface Table BIOS Specification".
*
- * We need to use a stable sorting algortihm, as the order of
+ * We need to use a stable sorting algorithm, as the order of
* FIT_TYPE_BIOS_STARTUP matter for measurements.
*/
static void sort_fit_table(struct fit_table *fit)
diff --git a/util/cbfstool/ifwitool.c b/util/cbfstool/ifwitool.c
index 76b84e26df..b25db4f099 100644
--- a/util/cbfstool/ifwitool.c
+++ b/util/cbfstool/ifwitool.c
@@ -387,7 +387,7 @@ static void alloc_buffer(struct buffer *b, size_t s, const char *n)
/*
* Read header/entry members in little-endian format.
- * Returns the offset upto which the read was performed.
+ * Returns the offset up to which the read was performed.
*/
static size_t read_member(void *src, size_t offset, size_t size_bytes,
void *dst)
@@ -415,7 +415,7 @@ static size_t read_member(void *src, size_t offset, size_t size_bytes,
/*
* Convert to little endian format.
- * Returns the offset upto which the fixup was performed.
+ * Returns the offset up to which the fixup was performed.
*/
static size_t fix_member(void *data, size_t offset, size_t size_bytes)
{
@@ -677,7 +677,7 @@ static size_t read_subpart_buf(void *data, size_t size, struct bpdt_entry *e,
/*
* Sub-partitions in IFWI image are not in the same order as
- * in BPDT entries. BPDT entires are in header_order whereas
+ * in BPDT entries. BPDT entries are in header_order whereas
* sub-partition offsets in the image are in pack_order.
*/
if ((e[i].offset + e[i].size) > max_offset)
diff --git a/util/cbfstool/rmodule.c b/util/cbfstool/rmodule.c
index 80e89118e5..1d087b1658 100644
--- a/util/cbfstool/rmodule.c
+++ b/util/cbfstool/rmodule.c
@@ -223,7 +223,7 @@ static int find_program_segment(struct rmod_context *ctx)
}
if (nsegments != 1) {
- ERROR("Unexepcted number of loadable segments: %d.\n",
+ ERROR("Unexpected number of loadable segments: %d.\n",
nsegments);
return -1;
}