From 4c95b5e04e3c4f72e4005574f67cd6e365d3276f Mon Sep 17 00:00:00 2001 From: Frederic Bonnard Date: Mon, 13 Jun 2016 11:37:09 +0200 Subject: Fix for typos While reviewing the Debian packaging, codespell found those. Most proposed fixes are based on codespell's default dictionnary. Signed-off-by: Frederic Bonnard Reviewed-by: Mukesh Ojha Signed-off-by: Stewart Smith --- external/boot-tests/bmc_support.sh | 6 +++--- external/gard/gard.c | 2 +- external/mambo/mambo_utils.tcl | 2 +- external/opal-prd/hostboot-interface.h | 2 +- external/opal-prd/i2c.c | 2 +- external/opal-prd/opal-prd.8 | 2 +- external/opal-prd/opal-prd.c | 4 ++-- external/opal-prd/test/test_pnor_ops.c | 2 +- external/pflash/pflash.c | 6 +++--- external/test/test.sh | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) (limited to 'external') diff --git a/external/boot-tests/bmc_support.sh b/external/boot-tests/bmc_support.sh index 0b4c675..f28c610 100644 --- a/external/boot-tests/bmc_support.sh +++ b/external/boot-tests/bmc_support.sh @@ -75,7 +75,7 @@ function flash { msg "Flashing full PNOR" $SSHCMD "$PFLASH_BINARY -E -f -p /tmp/image.pnor" if [ "$?" -ne "0" ] ; then - error "An unexpected pflash error has occured"; + error "An unexpected pflash error has occurred"; fi fi @@ -83,7 +83,7 @@ function flash { msg "Flashing PAYLOAD PNOR partition" $SSHCMD "$PFLASH_BINARY -e -f -P PAYLOAD -p /tmp/skiboot.lid" if [ "$?" -ne "0" ] ; then - error "An unexpected pflash error has occured"; + error "An unexpected pflash error has occurred"; fi fi @@ -91,7 +91,7 @@ function flash { msg "Flashing BOOTKERNEL PNOR partition" $SSHCMD "$PFLASH_BINARY -e -f -P BOOTKERNEL -p /tmp/bootkernel" if [ "$?" -ne "0" ] ; then - error "An unexpected pflash error has occured"; + error "An unexpected pflash error has occurred"; fi fi } diff --git a/external/gard/gard.c b/external/gard/gard.c index b2e814e..9da7496 100644 --- a/external/gard/gard.c +++ b/external/gard/gard.c @@ -127,7 +127,7 @@ static void show_flash_err(int rc) fprintf(stderr, "libflash ecc invalid\n"); break; default: - fprintf(stderr, "A libflash/libffs error has occured %d\n", rc); + fprintf(stderr, "A libflash/libffs error has occurred %d\n", rc); } } diff --git a/external/mambo/mambo_utils.tcl b/external/mambo/mambo_utils.tcl index 5e97302..65bf036 100644 --- a/external/mambo/mambo_utils.tcl +++ b/external/mambo/mambo_utils.tcl @@ -199,7 +199,7 @@ proc mywatch { } { while { [mysim memory display 0x700 8] != 0 } { mysim cycle 1 } - puts "condition occured " + puts "condition occurred " ipc } diff --git a/external/opal-prd/hostboot-interface.h b/external/opal-prd/hostboot-interface.h index 0393152..05fe052 100644 --- a/external/opal-prd/hostboot-interface.h +++ b/external/opal-prd/hostboot-interface.h @@ -181,7 +181,7 @@ struct host_interfaces { * @brief Write to Pnor * @param[in] i_proc: processor Id * @param[in] i_partitionName: name of the partition to write - * @param[in] i_offset: offset withing the partition + * @param[in] i_offset: offset within the partition * @param[in] i_data: pointer to the data to write * @param[in] i_sizeBytes: size of data to write * @retval rc - number of bytes written, or non-zero on error diff --git a/external/opal-prd/i2c.c b/external/opal-prd/i2c.c index 3c7b555..fbe2e9b 100644 --- a/external/opal-prd/i2c.c +++ b/external/opal-prd/i2c.c @@ -149,7 +149,7 @@ int i2c_write(uint32_t chip_id, uint8_t engine, uint8_t port, /* Not all kernel driver versions support breaking up a write into * two components (offset, data), so we coalesce them first and - * issue a single write. The offset is layed out in BE format. + * issue a single write. The offset is laid out in BE format. */ size = offset_size + length; buf = malloc(size); diff --git a/external/opal-prd/opal-prd.8 b/external/opal-prd/opal-prd.8 index f3aa797..72027f5 100644 --- a/external/opal-prd/opal-prd.8 +++ b/external/opal-prd/opal-prd.8 @@ -47,7 +47,7 @@ Note that the daemon must be running in the background here, as a separate process. .PP -Currently, there's one command available, 'occ', for controling the +Currently, there's one command available, 'occ', for controlling the on-chip-controllers. That has 3 possible sub-commands: \fIreset\fP, \fIenable\fP, and \fIdisable\fP. diff --git a/external/opal-prd/opal-prd.c b/external/opal-prd/opal-prd.c index d3dbc16..18c6e49 100644 --- a/external/opal-prd/opal-prd.c +++ b/external/opal-prd/opal-prd.c @@ -1168,7 +1168,7 @@ static int handle_msg_occ_error(struct opal_prd_ctx *ctx, proc = be64toh(msg->occ_error.chip); - pr_debug("FW: firmware signalled OCC error for proc 0x%x", proc); + pr_debug("FW: firmware signaled OCC error for proc 0x%x", proc); if (!hservice_runtime->process_occ_error) { pr_log_nocall("process_occ_error"); @@ -1636,7 +1636,7 @@ static int run_prd_daemon(struct opal_prd_ctx *ctx) pr_debug("HBRT: calling hservices_init"); rc = hservices_init(ctx, ctx->code_addr); if (rc) { - pr_log(LOG_ERR, "HBRT: Can't initiliase HBRT"); + pr_log(LOG_ERR, "HBRT: Can't initialise HBRT"); goto out_close; } pr_debug("HBRT: hservices_init done"); diff --git a/external/opal-prd/test/test_pnor_ops.c b/external/opal-prd/test/test_pnor_ops.c index 7ac471c..fd5e2c2 100644 --- a/external/opal-prd/test/test_pnor_ops.c +++ b/external/opal-prd/test/test_pnor_ops.c @@ -122,7 +122,7 @@ int main(int argc, char **argv) perror("mkstemp"); return EXIT_FAILURE; } - /* So the file dissapears when we exit */ + /* So the file disappears when we exit */ unlink(filename); /* E for empty */ diff --git a/external/pflash/pflash.c b/external/pflash/pflash.c index fddfe1d..c124356 100644 --- a/external/pflash/pflash.c +++ b/external/pflash/pflash.c @@ -404,7 +404,7 @@ static void enable_4B_addresses(void) rc = arch_flash_4b_mode(bl, true); if (rc) { if (rc == -1) { - fprintf(stderr, "Switching address mode not availible on this architecture\n"); + fprintf(stderr, "Switching address mode not available on this architecture\n"); } else { fprintf(stderr, "Error %d enabling 4b mode\n", rc); } @@ -421,7 +421,7 @@ static void disable_4B_addresses(void) rc = arch_flash_4b_mode(bl, false); if (rc) { if (rc == -1) { - fprintf(stderr, "Switching address mode not availible on this architecture\n"); + fprintf(stderr, "Switching address mode not available on this architecture\n"); } else { fprintf(stderr, "Error %d enabling 4b mode\n", rc); } @@ -480,7 +480,7 @@ static void print_help(const char *pname) printf("\t\tto specify the size to read (or it will use the source\n"); printf("\t\tfile size if used in conjunction with -p and -s is not\n"); printf("\t\tspecified). When using -r together with -e or -p, the\n"); - printf("\t\tread will be peformed first\n\n"); + printf("\t\tread will be performed first\n\n"); printf("\t-E, --erase-all\n"); printf("\t\tErase entire flash chip\n"); printf("\t\t(Not supported on all chips/controllers)\n\n"); diff --git a/external/test/test.sh b/external/test/test.sh index cfea786..827cd92 100755 --- a/external/test/test.sh +++ b/external/test/test.sh @@ -43,7 +43,7 @@ strip_version_from_result() { } diff_with_result() { - # Explicitly diff a file with an arbitary result file + # Explicitly diff a file with an arbitrary result file if [ "$#" -eq 1 ] ; then if ! diff -u "$RESULT" "$1" ; then fail_test; -- cgit v1.1