]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
colibri_imx6: Avoid calling setup_display() from SPL code
authorFabio Estevam <fabio.estevam@nxp.com>
Sat, 23 Sep 2017 02:45:33 +0000 (23:45 -0300)
committerStefano Babic <sbabic@denx.de>
Thu, 12 Oct 2017 15:30:32 +0000 (17:30 +0200)
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>
board/toradex/colibri_imx6/colibri_imx6.c

index 756e3f39df1b0dc829963950cdea5957bcf0061c..a2a421444b80c75c198748be8f86ce351a0024b3 100644 (file)
@@ -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