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
17380cb0
Commit
17380cb0
authored
16 years ago
by
Wolfgang Denk
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
git://git.denx.de/u-boot-fdt
parents
4cc64742
4bc7deee
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
common/fdt_support.c
+5
-2
5 additions, 2 deletions
common/fdt_support.c
libfdt/fdt_ro.c
+7
-4
7 additions, 4 deletions
libfdt/fdt_ro.c
with
12 additions
and
6 deletions
common/fdt_support.c
+
5
−
2
View file @
17380cb0
...
...
@@ -602,9 +602,12 @@ int fdt_resize(void *blob)
}
}
/* Calculate the actual size of the fdt */
/*
* Calculate the actual size of the fdt
* plus the size needed for fdt_add_mem_rsv
*/
actualsize
=
fdt_off_dt_strings
(
blob
)
+
fdt_size_dt_strings
(
blob
);
fdt_size_dt_strings
(
blob
)
+
sizeof
(
struct
fdt_reserve_entry
)
;
/* Make it so the fdt ends on a page boundary */
actualsize
=
ALIGN
(
actualsize
,
0x1000
);
...
...
This diff is collapsed.
Click to expand it.
libfdt/fdt_ro.c
+
7
−
4
View file @
17380cb0
...
...
@@ -112,12 +112,12 @@ int fdt_num_mem_rsv(const void *fdt)
int
fdt_subnode_offset_namelen
(
const
void
*
fdt
,
int
offset
,
const
char
*
name
,
int
namelen
)
{
int
depth
;
int
depth
=
0
;
FDT_CHECK_HEADER
(
fdt
);
for
(
depth
=
0
;
offset
>=
0
;
for
(
depth
=
0
,
offset
=
fdt_next_node
(
fdt
,
offset
,
&
depth
)
;
(
offset
>=
0
)
&&
(
depth
>
0
)
;
offset
=
fdt_next_node
(
fdt
,
offset
,
&
depth
))
{
if
(
depth
<
0
)
return
-
FDT_ERR_NOTFOUND
;
...
...
@@ -126,7 +126,10 @@ int fdt_subnode_offset_namelen(const void *fdt, int offset,
return
offset
;
}
if
(
offset
<
0
)
return
offset
;
/* error */
else
return
-
FDT_ERR_NOTFOUND
;
}
int
fdt_subnode_offset
(
const
void
*
fdt
,
int
parentoffset
,
...
...
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