summaryrefslogtreecommitdiff
path: root/board/toradex
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2017-09-22 23:45:33 -0300
committerStefano Babic <sbabic@denx.de>2017-10-12 17:30:32 +0200
commit464c988a1dd5356b84a375539d1a8d42c518a2db (patch)
tree79c41ebdddd4b85e8d5b133079e006ec0dde1e40 /board/toradex
parentf89bfe7c17a3018315b4f8f58ddce22ff9aeb56c (diff)
colibri_imx6: Avoid calling setup_display() from SPL code
There is no need call setup_display() from SPL code, so move it to board_init(), which executes only in U-Boot proper. Reported-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Diffstat (limited to 'board/toradex')
-rw-r--r--board/toradex/colibri_imx6/colibri_imx6.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 756e3f39df1..a2a421444b8 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -630,9 +630,6 @@ int board_early_init_f(void)
ARRAY_SIZE(pwr_intb_pads));
setup_iomux_uart();
-#if defined(CONFIG_VIDEO_IPUV3)
- setup_display();
-#endif
return 0;
}
@@ -653,6 +650,10 @@ int board_init(void)
setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info_loc);
+#if defined(CONFIG_VIDEO_IPUV3)
+ setup_display();
+#endif
+
#ifdef CONFIG_TDX_CMD_IMX_MFGR
(void) pmic_init();
#endif