diff options
| author | Robert P. J. Day <rpjday@crashcourse.ca> | 2014-10-21 16:44:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-27 17:54:11 -0400 |
| commit | 5699ea6d0ee01ab3e41d2cb2ebe2c56a24b9ffff (patch) | |
| tree | 6c5cc04b4467c131965c3c7f74d8538f878668f6 | |
| parent | 3bd6f7e7821b3f6b369c6dba2b0eeeb5892a4dd7 (diff) | |
| download | u-boot-imx-5699ea6d0ee01ab3e41d2cb2ebe2c56a24b9ffff.zip u-boot-imx-5699ea6d0ee01ab3e41d2cb2ebe2c56a24b9ffff.tar.gz u-boot-imx-5699ea6d0ee01ab3e41d2cb2ebe2c56a24b9ffff.tar.bz2 | |
Correct two non-functional misspellings "overrided".
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
| -rw-r--r-- | dts/Kconfig | 2 | ||||
| -rwxr-xr-x | scripts/kconfig/merge_config.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dts/Kconfig b/dts/Kconfig index 83ba7a6..5fe63f8 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -49,7 +49,7 @@ config DEFAULT_DEVICE_TREE string "Default Device Tree for DT control" help This option specifies the default Device Tree used for DT control. - It can be overrided from the command line: + It can be overridden from the command line: $ make DEVICE_TREE=<device-tree-name> endmenu diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 81b0c61..efa4733 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -87,7 +87,7 @@ TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) echo "Using $INITFILE as base" cat $INITFILE > $TMP_FILE -# Merge files, printing warnings on overrided values +# Merge files, printing warnings on overridden values for MERGE_FILE in $MERGE_LIST ; do echo "Merging $MERGE_FILE" CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE) |