From 2c572f62c17e314a35934cca08b7cdfc6a1dde95 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 1 Oct 2015 10:05:20 -0700 Subject: colibri_vf: fix compile error when disabling DCU If the DCU framebuffer is not configured, the board file still tries to call fsl_dcu_fixedfb_setup, which leads to a compile issue. Call fsl_dcu_fixedfb_setup only if DCU is enabled. --- board/toradex/colibri_vf/colibri_vf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'board') diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index 89b89dae37..327273345f 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -495,6 +495,7 @@ int checkboard_fallback(void) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) int ft_board_setup(void *blob, bd_t *bd) { + int ret = 0; #ifdef CONFIG_FDT_FIXUP_PARTITIONS static struct node_info nodes[] = { { "fsl,vf610-nfc", MTD_DEV_TYPE_NAND, }, /* NAND flash */ @@ -513,8 +514,11 @@ int ft_board_setup(void *blob, bd_t *bd) do_fixup_by_compat(blob, "fsl,vf610-ddrmc", "fsl,has-cke-reset-pulls", NULL, 0, 1); #endif +#ifdef CONFIG_FSL_DCU_FB + ret = fsl_dcu_fixedfb_setup(blob); +#endif - return fsl_dcu_fixedfb_setup(blob); + return ret; } #endif -- cgit v1.2.3