From: York Sun <york.sun@nxp.com>
Date: Tue, 26 Jun 2018 17:10:04 +0000 (-0700)
Subject: spl: nor: Skip CONFIG_SYS_FDT_BASE if not defined
X-Git-Tag: v2018.09-rc1~131
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=14acea0244e33c4522fa3ea774bb3e76fa9e4fb4;p=oweals%2Fu-boot.git

spl: nor: Skip CONFIG_SYS_FDT_BASE if not defined

If FIT image is used, CONFIG_SYS_FDT_BASE is not needed.

Signed-off-by: York Sun <york.sun@nxp.com>
---

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