Skip to content
Snippets Groups Projects
Commit 5699ea6d authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Tom Rini
Browse files

Correct two non-functional misspellings "overrided". 


Signed-off-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
parent 3bd6f7e7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dts/Kconfig
+ 1
− 1
View file @ 5699ea6d
...@@ -49,7 +49,7 @@ config DEFAULT_DEVICE_TREE ...@@ -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
scripts/kconfig/merge_config.sh
+ 1
− 1
View file @ 5699ea6d
...@@ -87,7 +87,7 @@ TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) ...@@ -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)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment