From: Seung-Woo Kim <sw0312.kim@samsung.com>
Date: Mon, 6 Jan 2020 09:46:08 +0000 (+0900)
Subject: spl: atf: cast NULL to uintptr_t explictly
X-Git-Tag: submit/tizen/20200107.060950^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0d1712d818e165aaad06a3baacd67036f144be7;p=platform%2Fkernel%2Fu-boot.git

spl: atf: cast NULL to uintptr_t explictly

The bl31_entry() requires uintptr_t for its 3rd argument but NULL
is used calling the function. Cast it explictly to avoid
int-conversion build warning.

Change-Id: I0033c1bdcb9e115745ecec67950487cb85aeaba2
Fixes: d332415fe82f ("spl: atf: call bl31_entry function before jump to u-boot")
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
---

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 71ed283007..d6fd4617c0 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -692,7 +692,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 	 * It has dependent with Dignsys's patch.
 	 */
 	if (IS_ENABLED(CONFIG_SPL_ATF))
-		bl31_entry(CONFIG_SPL_ATF_TEXT_BASE, CONFIG_SYS_TEXT_BASE, NULL);
+		bl31_entry(CONFIG_SPL_ATF_TEXT_BASE, CONFIG_SYS_TEXT_BASE,
+			   (uintptr_t)NULL);
 
 	debug("loaded - jumping to U-Boot...\n");
 	spl_board_prepare_for_boot();