summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile6
-rw-r--r--README4
-rw-r--r--arch/arm/cpu/arm926ejs/at91/eflash.c2
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/cpu.c2
-rw-r--r--board/RPXlite_dw/README4
-rw-r--r--board/freescale/mx28evk/README4
-rw-r--r--board/sbc8349/README2
-rw-r--r--common/image.c2
-rw-r--r--doc/README.hwconfig2
-rw-r--r--drivers/net/phy/smsc.c2
-rw-r--r--examples/standalone/README.smc91111_eeprom6
-rw-r--r--include/common.h2
-rw-r--r--include/configs/eXalion.h2
-rw-r--r--include/configs/sacsng.h2
-rw-r--r--lib/hashtable.c2
-rw-r--r--post/board/lwmon5/sysmon.c2
16 files changed, 23 insertions, 23 deletions
diff --git a/Makefile b/Makefile
index 28ddb7e836..1c9dc7a7a0 100644
--- a/Makefile
+++ b/Makefile
@@ -45,13 +45,13 @@ endif
#########################################################################
#
-# U-boot build supports producing a object files to the separate external
+# U-boot build supports generating object files in a separate external
# directory. Two use cases are supported:
#
# 1) Add O= to the make command line
# 'make O=/tmp/build all'
#
-# 2) Set environement variable BUILD_DIR to point to the desired location
+# 2) Set environment variable BUILD_DIR to point to the desired location
# 'export BUILD_DIR=/tmp/build'
# 'make'
#
@@ -59,7 +59,7 @@ endif
# 'export BUILD_DIR=/tmp/build'
# './MAKEALL'
#
-# Command line 'O=' setting overrides BUILD_DIR environent variable.
+# Command line 'O=' setting overrides BUILD_DIR environment variable.
#
# When none of the above methods is used the local build is performed and
# the object files are placed in the source directory.
diff --git a/README b/README
index be5336fba3..20ba650248 100644
--- a/README
+++ b/README
@@ -3364,7 +3364,7 @@ Configuration Settings:
the Linux kernel; all data that must be processed by
the Linux kernel (bd_info, boot arguments, FDT blob if
used) must be put below this limit, unless "bootm_low"
- enviroment variable is defined and non-zero. In such case
+ environment variable is defined and non-zero. In such case
all data for the Linux kernel must be between "bootm_low"
and "bootm_low" + CONFIG_SYS_BOOTMAPSZ. The environment
variable "bootm_mapsize" will override the value of
@@ -3477,7 +3477,7 @@ Configuration Settings:
- CONFIG_ENV_FLAGS_LIST_DEFAULT
- CONFIG_ENV_FLAGS_LIST_STATIC
- Enable validation of the values given to enviroment variables when
+ Enable validation of the values given to environment variables when
calling env set. Variables can be restricted to only decimal,
hexadecimal, or boolean. If CONFIG_CMD_NET is also defined,
the variables can also be restricted to IP address or MAC address.
diff --git a/arch/arm/cpu/arm926ejs/at91/eflash.c b/arch/arm/cpu/arm926ejs/at91/eflash.c
index 3e21cdb2fd..3f39264289 100644
--- a/arch/arm/cpu/arm926ejs/at91/eflash.c
+++ b/arch/arm/cpu/arm926ejs/at91/eflash.c
@@ -28,7 +28,7 @@
* by u-Boot commands.
*
* Note: Redundant environment will not work in this flash since
- * it does use partial page writes. Make sure the environent spans
+ * it does use partial page writes. Make sure the environment spans
* whole pages!
*/
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
index cde3172fe3..d4711c070c 100644
--- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
@@ -302,7 +302,7 @@ int arch_cpu_init(void)
/*
* Configures the I/O voltage of the pads connected to Egigabit
* Ethernet interface to 1.8V
- * By defult it is set to 3.3V
+ * By default it is set to 3.3V
*/
reg = readl(KW_REG_MPP_OUT_DRV_REG);
reg |= (1 << 7);
diff --git a/board/RPXlite_dw/README b/board/RPXlite_dw/README
index 14296b2ab4..9e2d0f42a0 100644
--- a/board/RPXlite_dw/README
+++ b/board/RPXlite_dw/README
@@ -87,9 +87,9 @@ u-boot>
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-A word on the U-Boot enviroment variable setting and usage :
+A word on the U-Boot environment variable setting and usage :
-In the beginning, you could just need very simple defult environment variable setting,
+In the beginning, you could just need very simple default environment variable setting,
like[include/configs/RPXlite.h] :
#define CONFIG_BOOTCOMMAND \
diff --git a/board/freescale/mx28evk/README b/board/freescale/mx28evk/README
index 524f3fc494..0389a1d86c 100644
--- a/board/freescale/mx28evk/README
+++ b/board/freescale/mx28evk/README
@@ -29,11 +29,11 @@ Environment Storage
There are two targets for mx28evk:
-"make mx28evk_config" - store enviroment variables into MMC
+"make mx28evk_config" - store environment variables into MMC
or
-"make mx28evk_nand_config" - store enviroment variables into NAND flash
+"make mx28evk_nand_config" - store environment variables into NAND flash
Choose the target accordingly.
diff --git a/board/sbc8349/README b/board/sbc8349/README
index 2c35919f28..e2d60cc530 100644
--- a/board/sbc8349/README
+++ b/board/sbc8349/README
@@ -50,7 +50,7 @@ is a summary of that information:
trying to preserve your old environment settings and user flash).
- Set the start address of the erase/flash process to FF80_0000
- Set the target RAM required to 64kB.
- - Select sectors for erasing (see note on enviroment below)
+ - Select sectors for erasing (see note on environment below)
- Select Erase and Reprogram.
Note that some versions of the register files used with Workbench
diff --git a/common/image.c b/common/image.c
index 2c88091e6d..802a79e902 100644
--- a/common/image.c
+++ b/common/image.c
@@ -965,7 +965,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
* @initrd_end: pointer to a ulong variable, will hold final init ramdisk
* end address (after possible relocation)
*
- * boot_ramdisk_high() takes a relocation hint from "initrd_high" environement
+ * boot_ramdisk_high() takes a relocation hint from "initrd_high" environment
* variable and if requested ramdisk data is moved to a specified location.
*
* Initrd_start and initrd_end are set to final (after relocation) ramdisk
diff --git a/doc/README.hwconfig b/doc/README.hwconfig
index cf549651c7..b6ddb438cf 100644
--- a/doc/README.hwconfig
+++ b/doc/README.hwconfig
@@ -18,7 +18,7 @@ Current implementation details/limitations:
U-Boot. But I haven't bothered yet.
2. Since we don't implement a hwconfig command, i.e. we're working
- with the environement directly, there is no way to tell that
+ with the environment directly, there is no way to tell that
toggling a particular option will need a reboot to take
effect. So, for now it's advised to always reboot the
target after modifying the hwconfig variable.
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index 5936f9bd7f..60ed92d203 100644
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -7,7 +7,7 @@
* Copyright 2010-2011 Freescale Semiconductor, Inc.
* author Andy Fleming
*
- * Some code get from linux kenrel
+ * Some code copied from linux kernel
* Copyright (c) 2006 Herbert Valerio Riedel <hvr@gnu.org>
*/
#include <miiphy.h>
diff --git a/examples/standalone/README.smc91111_eeprom b/examples/standalone/README.smc91111_eeprom
index 28e7e69788..a2d52e7770 100644
--- a/examples/standalone/README.smc91111_eeprom
+++ b/examples/standalone/README.smc91111_eeprom
@@ -154,10 +154,10 @@ The MAC address can be stored in four locations:
-Boot environmental variable in Flash <- can not change, without
re-flashing U-boot.
-U-Boot environental variable <- can not change, without
+U-Boot environmental variable <- can not change, without
resetting board/U-Boot
-LAN91C111 Registers <- volitle
-LAN91C111 EEPROM <- Non Volitle
+LAN91C111 Registers <- volatile
+LAN91C111 EEPROM <- Non-volatile
If you have not activated the network, and do not have a hardcoded
or pre-assigned MAC address in U-boot, the environmental variables
diff --git a/include/common.h b/include/common.h
index 8addf43343..6aa2398229 100644
--- a/include/common.h
+++ b/include/common.h
@@ -383,7 +383,7 @@ int setenv_hex(const char *varname, ulong value);
/**
* setenv_addr - Set an environment variable to an address in hex
*
- * @varname: Environmet variable to set
+ * @varname: Environment variable to set
* @addr: Value to set it to
* @return 0 if ok, 1 on error
*/
diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h
index c2d04a21c7..7321b60c2f 100644
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -119,7 +119,7 @@
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x20000 /* Size of one Flash sector */
-#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE /* Use one Flash sector for enviroment */
+#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE /* Use one Flash sector for environment */
#define CONFIG_ENV_ADDR 0xFFFC0000
#define CONFIG_ENV_OFFSET 0 /* starting right at the beginning */
diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index d63d0c4f54..0feef1eabb 100644
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -305,7 +305,7 @@
#define CONFIG_ENV_IN_OWN_SECT 1
/* Define this to contain any number of null terminated strings that
- * will be part of the default enviroment compiled into the boot image.
+ * will be part of the default environment compiled into the boot image.
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"quiet=0\0" \
diff --git a/lib/hashtable.c b/lib/hashtable.c
index 644330a17e..c5a2b08bec 100644
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -817,7 +817,7 @@ int himport_r(struct hsearch_data *htab,
* size of 8 per entry (= safety factor of ~5) should provide enough
* safety margin for any existing environment definitions and still
* allow for more than enough dynamic additions. Note that the
- * "size" argument is supposed to give the maximum enviroment size
+ * "size" argument is supposed to give the maximum environment size
* (CONFIG_ENV_SIZE). This heuristics will result in
* unreasonably large numbers (and thus memory footprint) for
* big flash environments (>8,000 entries for 64 KB
diff --git a/post/board/lwmon5/sysmon.c b/post/board/lwmon5/sysmon.c
index da37d66bfa..cca1a26235 100644
--- a/post/board/lwmon5/sysmon.c
+++ b/post/board/lwmon5/sysmon.c
@@ -22,7 +22,7 @@
*
* LCD backlight is not enabled if temperature values are not within
* allowed ranges (-30 .. + 80). The brightness of backlite can be
- * controlled by setting "brightness" enviroment variable. Default value is 50%
+ * controlled by setting "brightness" environment variable. Default value is 50%
*
* See the list of all parameters in the sysmon_table below
*/
generated by cgit (git 2.34.1) at 2024-12-23 01:40:52 +0000