summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dts/Kconfig2
-rwxr-xr-xscripts/kconfig/merge_config.sh2
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)