From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Sat, 28 Nov 2020 08:43:20 +0000 (+0200)
Subject: global_data: Enable spl_handoff only if CONFIG_HANDOFF is set
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=13e0f020f7710418c4f8ed231660f91cdd979254;p=u-boot.git

global_data: Enable spl_handoff only if CONFIG_HANDOFF is set

spl_handoff should only be enabled when CONFIG_HANDOFF is set. Drop the
nested ifdefs and check for CONFIG_HANDOFF instead.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index efa09a1943..19f70393b4 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -412,12 +412,12 @@ struct global_data {
 	 * @new_bloblist: relocated blob list information
 	 */
 	struct bloblist_hdr *new_bloblist;
-# ifdef CONFIG_SPL
+#endif
+#if CONFIG_IS_ENABLED(HANDOFF)
 	/**
 	 * @spl_handoff: SPL hand-off information
 	 */
 	struct spl_handoff *spl_handoff;
-# endif
 #endif
 #if defined(CONFIG_TRANSLATION_OFFSET)
 	/**