Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
u-boot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Florian Mayer
u-boot
Commits
5699ea6d
Commit
5699ea6d
authored
10 years ago
by
Robert P. J. Day
Committed by
Tom Rini
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Correct two non-functional misspellings "overrided".
Signed-off-by:
Robert P. J. Day
<
rpjday@crashcourse.ca
>
parent
3bd6f7e7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dts/Kconfig
+1
-1
1 addition, 1 deletion
dts/Kconfig
scripts/kconfig/merge_config.sh
+1
-1
1 addition, 1 deletion
scripts/kconfig/merge_config.sh
with
2 additions
and
2 deletions
dts/Kconfig
+
1
−
1
View file @
5699ea6d
...
...
@@ -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 overrid
e
d from the command line:
It can be overridd
en
from the command line:
$ make DEVICE_TREE=<device-tree-name>
endmenu
This diff is collapsed.
Click to expand it.
scripts/kconfig/merge_config.sh
+
1
−
1
View file @
5699ea6d
...
...
@@ -87,7 +87,7 @@ TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
echo
"Using
$INITFILE
as base"
cat
$INITFILE
>
$TMP_FILE
# Merge files, printing warnings on overrid
e
d values
# Merge files, printing warnings on overridd
en
values
for
MERGE_FILE
in
$MERGE_LIST
;
do
echo
"Merging
$MERGE_FILE
"
CFG_LIST
=
$(
sed
-n
"
$SED_CONFIG_EXP
"
$MERGE_FILE
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment