Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
reform-boundary-uboot
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
Service Desk
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
Jack Humbert
reform-boundary-uboot
Commits
05195b2c
Commit
05195b2c
authored
9 years ago
by
Tom Rini
Browse files
Options
Downloads
Plain Diff
Merge
git://git.denx.de/u-boot-dm
parents
299e5bb7
070b781b
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
+2
-0
2 additions, 0 deletions
dts/Kconfig
tools/patman/series.py
+4
-1
4 additions, 1 deletion
tools/patman/series.py
with
6 additions
and
1 deletion
dts/Kconfig
+
2
−
0
View file @
05195b2c
...
@@ -61,7 +61,9 @@ config DEFAULT_DEVICE_TREE
...
@@ -61,7 +61,9 @@ config DEFAULT_DEVICE_TREE
config OF_SPL_REMOVE_PROPS
config OF_SPL_REMOVE_PROPS
string "List of device tree properties to drop for SPL"
string "List of device tree properties to drop for SPL"
depends on SPL_OF_CONTROL
depends on SPL_OF_CONTROL
default "interrupt-parent" if SPL_PINCTRL_FULL && SPL_CLK
default "clocks clock-names interrupt-parent" if SPL_PINCTRL_FULL
default "clocks clock-names interrupt-parent" if SPL_PINCTRL_FULL
default "pinctrl-0 pinctrl-names interrupt-parent" if SPL_CLK
default "pinctrl-0 pinctrl-names clocks clock-names interrupt-parent"
default "pinctrl-0 pinctrl-names clocks clock-names interrupt-parent"
help
help
Since SPL normally runs in a reduced memory space, the device tree
Since SPL normally runs in a reduced memory space, the device tree
...
...
This diff is collapsed.
Click to expand it.
tools/patman/series.py
+
4
−
1
View file @
05195b2c
...
@@ -69,7 +69,10 @@ class Series(dict):
...
@@ -69,7 +69,10 @@ class Series(dict):
# Otherwise just set the value
# Otherwise just set the value
elif
name
in
valid_series
:
elif
name
in
valid_series
:
self
[
name
]
=
value
if
name
==
"
notes
"
:
self
[
name
]
=
[
value
]
else
:
self
[
name
]
=
value
else
:
else
:
raise
ValueError
(
"
In %s: line
'
%s
'
: Unknown
'
Series-%s
'
: valid
"
raise
ValueError
(
"
In %s: line
'
%s
'
: Unknown
'
Series-%s
'
: valid
"
"
options are %s
"
%
(
commit
.
hash
,
line
,
name
,
"
options are %s
"
%
(
commit
.
hash
,
line
,
name
,
...
...
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