diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2016-03-22 22:51:52 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2016-03-23 22:04:13 +0100 |
| commit | d75111a79b758274b0bed9c66a925cf57bbad358 (patch) | |
| tree | 16c3df7fee38a7db160b47bd3d8c57d4f17a1b74 /board | |
| parent | 43dea54338095361bec432ade8f313a50adfae1f (diff) | |
| download | talos-obmc-uboot-d75111a79b758274b0bed9c66a925cf57bbad358.tar.gz talos-obmc-uboot-d75111a79b758274b0bed9c66a925cf57bbad358.zip | |
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 <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/board.c | 9 |
1 files changed, 6 insertions, 3 deletions
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 */ |
