diff mbox series

[U-Boot,2/2] spl: nor: Skip CONFIG_SYS_FDT_BASE if not defined

Message ID 1530033005-29044-2-git-send-email-york.sun@nxp.com
State Accepted
Commit 14acea0244e33c4522fa3ea774bb3e76fa9e4fb4
Delegated to: Tom Rini
Headers show
Series [U-Boot,1/2] spl: nor: Add FIT support | expand

Commit Message

York Sun June 26, 2018, 5:10 p.m. UTC 
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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Tom Rini July 20, 2018, 12:35 p.m. UTC | #1 
On Tue, Jun 26, 2018 at 10:10:04AM -0700, York Sun wrote:

> If FIT image is used, CONFIG_SYS_FDT_BASE is not needed.
> 
> Signed-off-by: York Sun <york.sun@nxp.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index b919fff..969e319 100644
--- 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 {