projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: py: dfu: Add variables to store dfu alt numbers for test and dummy files
[oweals/u-boot.git]
/
common
/
image-fdt.c
diff --git
a/common/image-fdt.c
b/common/image-fdt.c
index 5e4e5bd914e8757f8e413586143a3067ecb7da37..6cac7dbb7f8b2ff0fe5114b9d65ba655e3bf2fc3 100644
(file)
--- a/
common/image-fdt.c
+++ b/
common/image-fdt.c
@@
-231,7
+231,7
@@
int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
ulong fdt_addr;
char *fdt_blob = NULL;
void *buf;
ulong fdt_addr;
char *fdt_blob = NULL;
void *buf;
-#if
defined(CONFIG_
FIT)
+#if
CONFIG_IS_ENABLED(
FIT)
const char *fit_uname_config = images->fit_uname_cfg;
const char *fit_uname_fdt = NULL;
ulong default_addr;
const char *fit_uname_config = images->fit_uname_cfg;
const char *fit_uname_fdt = NULL;
ulong default_addr;
@@
-246,7
+246,7
@@
int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
if (argc > 2)
select = argv[2];
if (select || genimg_has_config(images)) {
if (argc > 2)
select = argv[2];
if (select || genimg_has_config(images)) {
-#if
defined(CONFIG_
FIT)
+#if
CONFIG_IS_ENABLED(
FIT)
if (select) {
/*
* If the FDT blob comes from the FIT image and the
if (select) {
/*
* If the FDT blob comes from the FIT image and the
@@
-276,7
+276,7
@@
int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
debug("* fdt: cmdline image address = 0x%08lx\n",
fdt_addr);
}
debug("* fdt: cmdline image address = 0x%08lx\n",
fdt_addr);
}
-#if
defined(CONFIG_
FIT)
+#if
CONFIG_IS_ENABLED(
FIT)
} else {
/* use FIT configuration provided in first bootm
* command argument
} else {
/* use FIT configuration provided in first bootm
* command argument
@@
-351,7
+351,7
@@
int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
* (libfdt based) and raw FDT blob (also libfdt
* based).
*/
* (libfdt based) and raw FDT blob (also libfdt
* based).
*/
-#if
defined(CONFIG_
FIT)
+#if
CONFIG_IS_ENABLED(
FIT)
/* check FDT blob vs FIT blob */
if (fit_check_format(buf)) {
ulong load, len;
/* check FDT blob vs FIT blob */
if (fit_check_format(buf)) {
ulong load, len;
@@
-450,7
+450,7
@@
error:
* addresses of some of the devices in the device tree are compared with the
* actual addresses at which U-Boot has placed them.
*
* addresses of some of the devices in the device tree are compared with the
* actual addresses at which U-Boot has placed them.
*
- * Returns 1 on success, 0 on failure. If 0 is returned, U-
b
oot will halt the
+ * Returns 1 on success, 0 on failure. If 0 is returned, U-
B
oot will halt the
* boot process.
*/
__weak int ft_verify_fdt(void *fdt)
* boot process.
*/
__weak int ft_verify_fdt(void *fdt)
@@
-502,8
+502,9
@@
int image_setup_libfdt(bootm_headers_t *images, void *blob,
fdt_fixup_ethernet(blob);
/* Delete the old LMB reservation */
fdt_fixup_ethernet(blob);
/* Delete the old LMB reservation */
- lmb_free(lmb, (phys_addr_t)(u32)(uintptr_t)blob,
- (phys_size_t)fdt_totalsize(blob));
+ if (lmb)
+ lmb_free(lmb, (phys_addr_t)(u32)(uintptr_t)blob,
+ (phys_size_t)fdt_totalsize(blob));
ret = fdt_shrink_to_minimum(blob);
if (ret < 0)
ret = fdt_shrink_to_minimum(blob);
if (ret < 0)
@@
-515,7
+516,8
@@
int image_setup_libfdt(bootm_headers_t *images, void *blob,
fdt_set_totalsize(blob, of_size);
}
/* Create a new LMB reservation */
fdt_set_totalsize(blob, of_size);
}
/* Create a new LMB reservation */
- lmb_reserve(lmb, (ulong)blob, of_size);
+ if (lmb)
+ lmb_reserve(lmb, (ulong)blob, of_size);
fdt_initrd(blob, *initrd_start, *initrd_end);
if (!ft_verify_fdt(blob))
fdt_initrd(blob, *initrd_start, *initrd_end);
if (!ft_verify_fdt(blob))