projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
davinci: omapl138_lcdk: increase u-boot load size
[oweals/u-boot.git]
/
common
/
image-fdt.c
diff --git
a/common/image-fdt.c
b/common/image-fdt.c
index 6cac7dbb7f8b2ff0fe5114b9d65ba655e3bf2fc3..e7540be8d631c4a1cbe08e2fb7ed70306dfa61a9 100644
(file)
--- a/
common/image-fdt.c
+++ b/
common/image-fdt.c
@@
-285,7
+285,7
@@
int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
fdt_noffset = fit_get_node_from_config(images,
FIT_FDT_PROP,
fdt_addr);
fdt_noffset = fit_get_node_from_config(images,
FIT_FDT_PROP,
fdt_addr);
- if (fdt_noffset == -ENO
LINK
)
+ if (fdt_noffset == -ENO
ENT
)
return 0;
else if (fdt_noffset < 0)
return 1;
return 0;
else if (fdt_noffset < 0)
return 1;
@@
-458,11
+458,6
@@
__weak int ft_verify_fdt(void *fdt)
return 1;
}
return 1;
}
-__weak int arch_fixup_fdt(void *blob)
-{
- return 0;
-}
-
int image_setup_libfdt(bootm_headers_t *images, void *blob,
int of_size, struct lmb *lmb)
{
int image_setup_libfdt(bootm_headers_t *images, void *blob,
int of_size, struct lmb *lmb)
{
@@
-506,7
+501,7
@@
int image_setup_libfdt(bootm_headers_t *images, void *blob,
lmb_free(lmb, (phys_addr_t)(u32)(uintptr_t)blob,
(phys_size_t)fdt_totalsize(blob));
lmb_free(lmb, (phys_addr_t)(u32)(uintptr_t)blob,
(phys_size_t)fdt_totalsize(blob));
- ret = fdt_shrink_to_minimum(blob);
+ ret = fdt_shrink_to_minimum(blob
, 0
);
if (ret < 0)
goto err;
of_size = ret;
if (ret < 0)
goto err;
of_size = ret;