Merge branch 'skiboot-5.1.x' into skiboot-5.2.x

8 files changed, 12 insertions, 12 deletions

diff --git a/external/boot-tests/bmc_support.sh b/external/boot-tests/bmc_support.sh
index 610c050..7d9ff4e 100644
--- a/external/boot-tests/bmc_support.sh
+++ b/external/boot-tests/bmc_support.sh
@@ -69,7 +69,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
 
@@ -77,7 +77,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
 
@@ -85,7 +85,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 2163707..db4ce4d 100644
--- a/external/gard/gard.c
+++ b/external/gard/gard.c
@@ -128,7 +128,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 0d268d3..ca2e148 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/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 7fc0de8..7f32be7 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);
 		}
@@ -478,7 +478,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");