diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-08 09:48:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-08 09:48:04 -0500 |
| commit | 57dc53a72460e8e301fa1cc7951b41db8e731485 (patch) | |
| tree | 856a679e994fdc529a97763e851ed2e546ba3742 /common | |
| parent | 7b6dc11c1aa69e5cc22d1659f50594edcfab5a9e (diff) | |
| parent | 2300184f702656b72394e458bf15f7aaba8af892 (diff) | |
| download | blackbird-obmc-uboot-57dc53a72460e8e301fa1cc7951b41db8e731485.tar.gz blackbird-obmc-uboot-57dc53a72460e8e301fa1cc7951b41db8e731485.zip | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'common')
| -rw-r--r-- | common/image-fdt.c | 2 | ||||
| -rw-r--r-- | common/image.c | 2 | ||||
| -rw-r--r-- | common/kgdb_stubs.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/common/image-fdt.c b/common/image-fdt.c index 5e4e5bd914..79fa65563f 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -450,7 +450,7 @@ error: * addresses of some of the devices in the device tree are compared with the * actual addresses at which U-Boot has placed them. * - * Returns 1 on success, 0 on failure. If 0 is returned, U-boot will halt the + * Returns 1 on success, 0 on failure. If 0 is returned, U-Boot will halt the * boot process. */ __weak int ft_verify_fdt(void *fdt) diff --git a/common/image.c b/common/image.c index f4a1dc8e25..75b1104bf3 100644 --- a/common/image.c +++ b/common/image.c @@ -1265,7 +1265,7 @@ int boot_get_loadable(int argc, char * const argv[], bootm_headers_t *images, * @cmd_end: pointer to a ulong variable, will hold cmdline end * * boot_get_cmdline() allocates space for kernel command line below - * BOOTMAPSZ + getenv_bootm_low() address. If "bootargs" U-boot environemnt + * BOOTMAPSZ + getenv_bootm_low() address. If "bootargs" U-Boot environemnt * variable is present its contents is copied to allocated kernel * command line. * diff --git a/common/kgdb_stubs.c b/common/kgdb_stubs.c index 19b0c1824d..5278209909 100644 --- a/common/kgdb_stubs.c +++ b/common/kgdb_stubs.c @@ -1,5 +1,5 @@ /* - * U-boot - stub functions for common kgdb code, + * U-Boot - stub functions for common kgdb code, * can be overridden in board specific files * * Copyright 2009 Analog Devices Inc. |
