From d75111a79b758274b0bed9c66a925cf57bbad358 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 22 Mar 2016 22:51:52 +0100 Subject: sunxi: Select CONFIG_OF_BOARD_SETUP from arch/arm/Kconfig Always select OF_BOARD_SETUP on sunxi, rather then having it in almost all our defconfigs. This also fixes it missing from some recently added defconfigs. This commit also modifies our ft_board_setup() to not cause warnings when CONFIG_VIDEO_DT_SIMPLEFB is not set, since we will now always build it. Signed-off-by: Hans de Goede Acked-by: Ian Campbell --- board/sunxi/board.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'board/sunxi') diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 2e2a1f59bc..2d5335f953 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -607,11 +607,14 @@ int misc_init_r(void) } #endif -#ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, bd_t *bd) { + int __maybe_unused r; + #ifdef CONFIG_VIDEO_DT_SIMPLEFB - return sunxi_simplefb_setup(blob); + r = sunxi_simplefb_setup(blob); + if (r) + return r; #endif + return 0; } -#endif /* CONFIG_OF_BOARD_SETUP */ -- cgit v1.2.1