Correct two non-functional misspellings "overrided".

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
master
Robert P. J. Day 10 years ago committed by Tom Rini
parent 3bd6f7e782
commit 5699ea6d0e
  1. 2
      dts/Kconfig
  2. 2
      scripts/kconfig/merge_config.sh

@ -49,7 +49,7 @@ config DEFAULT_DEVICE_TREE
string "Default Device Tree for DT control" string "Default Device Tree for DT control"
help help
This option specifies the default Device Tree used for DT control. 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> $ make DEVICE_TREE=<device-tree-name>
endmenu endmenu

@ -87,7 +87,7 @@ TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
echo "Using $INITFILE as base" echo "Using $INITFILE as base"
cat $INITFILE > $TMP_FILE 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 for MERGE_FILE in $MERGE_LIST ; do
echo "Merging $MERGE_FILE" echo "Merging $MERGE_FILE"
CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE) CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)

Loading…
Cancel
Save