diff mbox series

[v4,17/18] spl: Kconfig: Add SPL dependency to CONFIG_HANDOFF

Message ID 20201128084320.10164-18-ovidiu.panait@windriver.com
State Accepted
Delegated to: Tom Rini
Headers show
Series Minor board_f/board_r cleanups | expand

Commit Message

Ovidiu Panait Nov. 28, 2020, 8:43 a.m. UTC 
CONFIG_HANDOFF is used in u-boot proper to locate handoff info from SPL
during pre-relocation init (in setup_spl_handoff). Add explicit dependency
on CONFIG_SPL, to fix the following build error when CONFIG_HANDOFF &&
!CONFIG_SPL:

common/board_f.c: In function ‘setup_spl_handoff’:
common/board_f.c:283:4: error: ‘gd_t {aka struct global_data}’
has no member named ‘spl_handoff’
  gd->spl_handoff = bloblist_find(BLOBLISTT_SPL_HANDOFF,
    ^~

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

v3 updates:
- none

v2 updates:
- add reviewed-by tag

 common/spl/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tom Rini Jan. 16, 2021, 4:24 p.m. UTC | #1 
On Sat, Nov 28, 2020 at 10:43:19AM +0200, Ovidiu Panait wrote:

> CONFIG_HANDOFF is used in u-boot proper to locate handoff info from SPL
> during pre-relocation init (in setup_spl_handoff). Add explicit dependency
> on CONFIG_SPL, to fix the following build error when CONFIG_HANDOFF &&
> !CONFIG_SPL:
> 
> common/board_f.c: In function ‘setup_spl_handoff’:
> common/board_f.c:283:4: error: ‘gd_t {aka struct global_data}’
> has no member named ‘spl_handoff’
>   gd->spl_handoff = bloblist_find(BLOBLISTT_SPL_HANDOFF,
>     ^~
> 
> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

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

Patch

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index d8086bd9e8..cd980e96b8 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -117,7 +117,7 @@  endmenu
 
 config HANDOFF
 	bool "Pass hand-off information from SPL to U-Boot proper"
-	depends on BLOBLIST
+	depends on SPL && BLOBLIST
 	help
 	  It is useful to be able to pass information from SPL to U-Boot
 	  proper to preserve state that is known in SPL and is needed in U-Boot.