projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
6ecd820
)
spl: nor: Skip CONFIG_SYS_FDT_BASE if not defined
author
York Sun
<york.sun@nxp.com>
Tue, 26 Jun 2018 17:10:04 +0000
(10:10 -0700)
committer
Tom Rini
<trini@konsulko.com>
Thu, 19 Jul 2018 20:20:13 +0000
(16:20 -0400)
If FIT image is used, CONFIG_SYS_FDT_BASE is not needed.
Signed-off-by: York Sun <york.sun@nxp.com>
common/spl/spl_nor.c
patch
|
blob
|
history
diff --git
a/common/spl/spl_nor.c
b/common/spl/spl_nor.c
index
b919fff
..
969e319
100644
(file)
--- a/
common/spl/spl_nor.c
+++ b/
common/spl/spl_nor.c
@@
-62,8
+62,9
@@
static int spl_nor_load_image(struct spl_image_info *spl_image,
(void *)(CONFIG_SYS_OS_BASE +
sizeof(struct image_header)),
spl_image->size);
-
+#ifdef CONFIG_SYS_FDT_BASE
spl_image->arg = (void *)CONFIG_SYS_FDT_BASE;
+#endif
return 0;
} else {